[DCAE-7] updates for parameterized flavor/images

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

7 files changed, 20 insertions, 8 deletions

diff --git a/OPENECOMP-DEMO-1-NIC-FLOATING-IPS/env.yaml b/OPENECOMP-DEMO-1-NIC-FLOATING-IPS/env.yaml
index e5ec901..d40ecd8 100644
--- a/OPENECOMP-DEMO-1-NIC-FLOATING-IPS/env.yaml
+++ b/OPENECOMP-DEMO-1-NIC-FLOATING-IPS/env.yaml
@@ -34,6 +34,10 @@ open-ecomp-demo:
   zone: "@{ZONE}"
   dns-ip: "@{DNS-IP-ADDR}"
   postgres-ip: "@{dcae_pstg00_float_ip_addr}"
+  flavor: "@{FLAVOR-LARGE}"
+  image:
+    ubuntu14-04: "@{UBUNTU-1404-IMAGE}"
+    ubuntu16-04: "@{UBUNTU-1604-IMAGE}"
   git:
     mr-repo: "@{GIT-MR-REPO}"
   maven:
diff --git a/OPENECOMP-DEMO-2-NIC/env.yaml b/OPENECOMP-DEMO-2-NIC/env.yaml
index d25ef9e..c915d33 100644
--- a/OPENECOMP-DEMO-2-NIC/env.yaml
+++ b/OPENECOMP-DEMO-2-NIC/env.yaml
@@ -34,6 +34,10 @@ open-ecomp-demo:
   zone: "@{ZONE}"
   dns-ip: "@{DNS-IP-ADDR}"
   postgres-ip: "@{dcae_pstg00_ip_addr}"
+  flavor: "@{FLAVOR-LARGE}"
+  image:
+    ubuntu14-04: "@{UBUNTU-1404-IMAGE}"
+    ubuntu16-04: "@{UBUNTU-1604-IMAGE}"
   git:
     mr-repo: "@{GIT-MR-REPO}"
   maven:
diff --git a/OPENECOMP-DEMO-RACKSPACE/env.yaml b/OPENECOMP-DEMO-RACKSPACE/env.yaml
index f455256..526e460 100644
--- a/OPENECOMP-DEMO-RACKSPACE/env.yaml
+++ b/OPENECOMP-DEMO-RACKSPACE/env.yaml
@@ -34,6 +34,10 @@ open-ecomp-demo:
   zone: "@{ZONE}"
   dns-ip: 10.0.0.1
   postgres-ip: 10.0.4.101
+  flavor: "@{FLAVOR-LARGE}"
+  image:
+    ubuntu14-04: "@{UBUNTU-1404-IMAGE}"
+    ubuntu16-04: "@{UBUNTU-1604-IMAGE}"
   git:
     mr-repo: "@{GIT-MR-REPO}"
   maven:
diff --git a/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml b/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml
index de4c43f..a375f45 100644
--- a/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml
+++ b/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml
@@ -114,9 +114,9 @@ openstack-vm-type:
   numberOfCores: 8
   rootDiskSizeGB: 40
   diskSizeGB: 80
-  imageName: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
+  imageName: ${dcae.env('open-ecomp-demo.image.ubuntu14-04')}
   #Flavor details to be confirmed. May need to cretae a new flavor
-  openstack-flavor-name: 8 GB Performance
+  openstack-flavor-name: ${dcae.env('open-ecomp-demo.flavor')}
   disk-partitions:
     osType: ubuntu
     volumes:
diff --git a/OPENECOMP-DEMO/vm-templates/vm-controller.yaml b/OPENECOMP-DEMO/vm-templates/vm-controller.yaml
index fe2bd6a..59b8f14 100644
--- a/OPENECOMP-DEMO/vm-templates/vm-controller.yaml
+++ b/OPENECOMP-DEMO/vm-templates/vm-controller.yaml
@@ -52,8 +52,8 @@ openstack-vm-type:
   numberOfCores: 4
   dev-numberOfCores: 4
   rootDiskSizeGB: 80
-  imageName: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
-  openstack-flavor-name: 8 GB Performance
+  imageName: ${dcae.env('open-ecomp-demo.image.ubuntu14-04')}
+  openstack-flavor-name: ${dcae.env('open-ecomp-demo.flavor')}
   disk-partitions:
     osType: ubuntu
     volumes:
diff --git a/OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml b/OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml
index 171b305..15fefff 100644
--- a/OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml
+++ b/OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml
@@ -127,8 +127,8 @@ openstack-vm-type:
   numberOfCores: 8
   rootDiskSizeGB: 40
   diskSizeGB: 80
-  imageName: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
-  openstack-flavor-name: 8 GB Performance
+  imageName: ${dcae.env('open-ecomp-demo.image.ubuntu14-04')}
+  openstack-flavor-name: ${dcae.env('open-ecomp-demo.flavor')}
   disk-partitions:
     osType: ubuntu
     volumes:
diff --git a/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml b/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml
index 2ab5beb..17d16f0 100644
--- a/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml
+++ b/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml
@@ -122,8 +122,8 @@ openstack-vm-type:
   numberOfCores: 8
   rootDiskSizeGB: 40
   diskSizeGB: 80
-  imageName: Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM)
-  openstack-flavor-name: 8 GB Performance
+  imageName: ${dcae.env('open-ecomp-demo.image.ubuntu16-04')}
+  openstack-flavor-name: ${dcae.env('open-ecomp-demo.flavor')}
   disk-partitions:
     osType: ubuntu
     volumes: