Updates to POM to fix deploy issues.

Also started on YAML configuration changes for LF.

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

3 files changed, 17 insertions, 41 deletions

diff --git a/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml b/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml
index c4530d4..3a7e138 100644
--- a/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml
+++ b/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml
@@ -41,20 +41,12 @@ installation-steps:
     ln -s /opt/app/groovy-2.4.6 /opt/app/groovy/246
   application-id: root
 
-#- step: maven-artifact
-#  group-id: org.openecomp.dcae.controller
-#  artifact-id: dcae-controller-core-utils
-#  version: ${dcae.env('open-ecomp-demo.versions.controller')}
-#  type: zip
-#  assembly-id: runtime
-#  application-id: dcae
-  
-- step: http
-  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae/zip-snapshots/dcae-controller-core-utils-${dcae.env('open-ecomp-demo.versions.controller')}-runtime.zip
-  user-name: ${dcae.env('open-ecomp-demo.maven.user')}
-  password: ${dcae.env('open-ecomp-demo.maven.password')}
-  type: zip
+- step: maven-artifact
+  group-id: org.openecomp.dcae.controller
   artifact-id: dcae-controller-core-utils
+  version: ${dcae.env('open-ecomp-demo.versions.controller')}
+  type: zip
+  assembly-id: runtime
   application-id: dcae
 
 - step: shell
@@ -78,13 +70,13 @@ installation-steps:
   application-id: dcae
 
 - step: http
-  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae/deb-snapshots/org.openecomp.dcae.apod/dcae-cdap-small-hadoop_${dcae.env('open-ecomp-demo.versions.apod')}.deb
+  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae.apod/deb-snapshots/dcae-cdap-small-hadoop_${dcae.env('open-ecomp-demo.versions.apod')}.deb
   user-name: ${dcae.env('open-ecomp-demo.maven.user')}
   password: ${dcae.env('open-ecomp-demo.maven.password')}
   type: deb
 
 - step: http
-  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae/deb-snapshots/org.openecomp.dcae.apod/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-snapshots/dcae-analytics-tca_${dcae.env('open-ecomp-demo.versions.apod')}.deb
   user-name: ${dcae.env('open-ecomp-demo.maven.user')}
   password: ${dcae.env('open-ecomp-demo.maven.password')}
   type: deb
diff --git a/OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml b/OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml
index 6727287..91978af 100644
--- a/OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml
+++ b/OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml
@@ -40,20 +40,12 @@ installation-steps:
     ln -s /opt/app/groovy-2.4.6 /opt/app/groovy/246
   application-id: root
 
-#- step: maven-artifact
-#  group-id: org.openecomp.dcae.controller
-#  artifact-id: dcae-controller-core-utils
-#  version: ${dcae.env('open-ecomp-demo.versions.controller')}
-#  type: zip
-#  assembly-id: runtime
-#  application-id: dcae
-  
-- step: http
-  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae/zip-snapshots/dcae-controller-core-utils-${dcae.env('open-ecomp-demo.versions.controller')}-runtime.zip
-  user-name: ${dcae.env('open-ecomp-demo.maven.user')}
-  password: ${dcae.env('open-ecomp-demo.maven.password')}
-  type: zip
+- step: maven-artifact
+  group-id: org.openecomp.dcae.controller
   artifact-id: dcae-controller-core-utils
+  version: ${dcae.env('open-ecomp-demo.versions.controller')}
+  type: zip
+  assembly-id: runtime
   application-id: dcae
 
 - step: shell
diff --git a/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml b/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml
index f9b3fe9..5e38393 100644
--- a/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml
+++ b/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml
@@ -51,20 +51,12 @@ installation-steps:
     echo "prepend domain-name-servers 10.0.0.1;" >> /etc/dhcp/dhclient.conf
     echo nameserver 10.0.0.1 >> /etc/resolvconf/resolv.conf.d/head  
 
-#- step: maven-artifact
-#  group-id: org.openecomp.dcae.controller
-#  artifact-id: dcae-controller-core-utils
-#  version: ${dcae.env('open-ecomp-demo.versions.controller')}
-#  type: zip
-#  assembly-id: runtime
-#  application-id: dcae
-  
-- step: http
-  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae/zip-snapshots/dcae-controller-core-utils-${dcae.env('open-ecomp-demo.versions.controller')}-runtime.zip
-  user-name: ${dcae.env('open-ecomp-demo.maven.user')}
-  password: ${dcae.env('open-ecomp-demo.maven.password')}
-  type: zip
+- step: maven-artifact
+  group-id: org.openecomp.dcae.controller
   artifact-id: dcae-controller-core-utils
+  version: ${dcae.env('open-ecomp-demo.versions.controller')}
+  type: zip
+  assembly-id: runtime
   application-id: dcae
 
 - step: shell