[DCAE-1] changes in YAML versions

Change-Id: I290ce46f46b1b57f2051965b3cce0dcddbe40b71
Signed-off-by: Carsten Lund <lund@research.att.com>

diff --git a/OPENECOMP-DEMO-RACKSPACE/env.yaml b/OPENECOMP-DEMO-RACKSPACE/env.yaml
index 20a5b75..66025cd 100644 (file)
--- a/OPENECOMP-DEMO-RACKSPACE/env.yaml
+++ b/OPENECOMP-DEMO-RACKSPACE/env.yaml
@@ -40,10 +40,10 @@ open-ecomp-demo:
     password: "@{NEXUS-PASSWORD}"  
   versions:
     controller: "@{DCAE-VERSION}"
-    apod: 1.0.0
-    postgres: 1.0.0-LATEST
-    databus-controller: 1.0.0
-    collector: 1.0.0
+    apod: "@{DCAE-VERSION}"
+    postgres: "@{DCAE-VERSION}"
+    databus-controller: latest
+    collector: latest
     
 users:
   "@{OPENSTACK-KEYNAME}":

diff --git a/OPENECOMP-DEMO/docker-templates/docker-common-event.yaml b/OPENECOMP-DEMO/docker-templates/docker-common-event.yaml
index 4eb51e4..ee4eab1 100644 (file)
--- a/OPENECOMP-DEMO/docker-templates/docker-common-event.yaml
+++ b/OPENECOMP-DEMO/docker-templates/docker-common-event.yaml
@@ -1,6 +1,6 @@
 controller-instance-configuration: 
   "$class": org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceInstance
-  image: "${dcae.env('open-ecomp-demo.docker.registry')}/dcae-controller-common-event:${dcae.env('open-ecomp-demo.versions.collector')}"
+  image: "${dcae.env('open-ecomp-demo.docker.registry')}/openecomp/dcae-collector-common-event:${dcae.env('open-ecomp-demo.versions.collector')}"
   portBindings:
     sec-http:
       containerPort: 8080

diff --git a/OPENECOMP-DEMO/docker-templates/docker-databus-controller.yaml b/OPENECOMP-DEMO/docker-templates/docker-databus-controller.yaml
index 356c3c6..46fc331 100644 (file)
--- a/OPENECOMP-DEMO/docker-templates/docker-databus-controller.yaml
+++ b/OPENECOMP-DEMO/docker-templates/docker-databus-controller.yaml
@@ -3,7 +3,7 @@ lifecycle-management:
   use-dcae-manager: no
 controller-instance-configuration: 
   "$class": org.openecomp.dcae.controller.service.docker.DockerServiceInstance
-  image: "${dcae.env('open-ecomp-demo.docker.registry')}/dcae_dmaapbc:${dcae.env('open-ecomp-demo.versions.databus-controller')}"
+  image: "${dcae.env('open-ecomp-demo.docker.registry')}/openecomp/dcae-dmaapbc:${dcae.env('open-ecomp-demo.versions.databus-controller')}"
   portBindings:
     sec-http:
       containerPort: 8080

diff --git a/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml b/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml
index 637da37..8219cc6 100644 (file)
--- a/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml
+++ b/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml
@@ -71,11 +71,11 @@ installation-steps:
   application-id: dcae
 
 - step: http
-  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae.apod.cdap/deb-snapshots/dcae-cdap-small-hadoop_${dcae.env('open-ecomp-demo.versions.apod')}.deb
+  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae.apod.cdap/deb-releases/dcae-cdap-small-hadoop_${dcae.env('open-ecomp-demo.versions.apod')}.deb
   type: deb
 
 - step: http
-  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae.apod.analytics/deb-snapshots/dcae-analytics-tca_${dcae.env('open-ecomp-demo.versions.apod')}.deb
+  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae.apod.analytics/deb-releases/dcae-analytics-tca_${dcae.env('open-ecomp-demo.versions.apod')}.deb
   type: deb
 
 - step: http

diff --git a/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml b/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml
index f8edda6..4c49eb7 100644 (file)
--- a/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml
+++ b/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml
@@ -89,23 +89,23 @@ installation-steps:
   application-id: root
 
 - step: http
-  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae.pgaas/deb-snapshots/org.openecomp.dcae.storage.pgaas/cdf_${dcae.env('open-ecomp-demo.versions.postgres')}.deb
+  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae.pgaas/deb-releases/org.openecomp.dcae.storage.pgaas-cdf_${dcae.env('open-ecomp-demo.versions.postgres')}.deb
   type: deb
 
 - step: http
-  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae.pgaas/deb-snapshots/org.openecomp.dcae.storage.pgaas/postgresql-prep_${dcae.env('open-ecomp-demo.versions.postgres')}.deb
+  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae.pgaas/deb-releases/org.openecomp.dcae.storage.pgaas-postgresql-prep_${dcae.env('open-ecomp-demo.versions.postgres')}.deb
   type: deb
 
 - step: http
-  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae.pgaas/deb-snapshots/org.openecomp.dcae.storage.pgaas/postgresql-config_${dcae.env('open-ecomp-demo.versions.postgres')}.deb
+  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae.pgaas/deb-releases/org.openecomp.dcae.storage.pgaas-postgresql-config_${dcae.env('open-ecomp-demo.versions.postgres')}.deb
   type: deb
 
 - step: http
-  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae.pgaas/deb-snapshots/org.openecomp.dcae.storage.pgaas/pgaas_${dcae.env('open-ecomp-demo.versions.postgres')}.deb
+  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae.pgaas/deb-snapshots/org.openecomp.dcae.storage.pgaas-pgaas_${dcae.env('open-ecomp-demo.versions.postgres')}.deb
   type: deb
 
 - step: http
-  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae.pgaas/deb-snapshots/org.openecomp.dcae.storage.pgaas/pgaas-post_${dcae.env('open-ecomp-demo.versions.postgres')}.deb
+  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae.pgaas/deb-snapshots/org.openecomp.dcae.storage.pgaas-pgaas-post_${dcae.env('open-ecomp-demo.versions.postgres')}.deb
   type: deb
 
 - step: shell