[DCAE-7] updates for parameterized flavor/images

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

diff --git a/OPENECOMP-DEMO-RACKSPACE/env.yaml b/OPENECOMP-DEMO-RACKSPACE/env.yaml
index 526e460..f738ef9 100644 (file)
--- a/OPENECOMP-DEMO-RACKSPACE/env.yaml
+++ b/OPENECOMP-DEMO-RACKSPACE/env.yaml
@@ -34,10 +34,10 @@ open-ecomp-demo:
   zone: "@{ZONE}"
   dns-ip: 10.0.0.1
   postgres-ip: 10.0.4.101
-  flavor: "@{FLAVOR-LARGE}"
+  flavor: 8 GB Performance
   image:
-    ubuntu14-04: "@{UBUNTU-1404-IMAGE}"
-    ubuntu16-04: "@{UBUNTU-1604-IMAGE}"
+    ubuntu14-04: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
+    ubuntu16-04: Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM)
   git:
     mr-repo: "@{GIT-MR-REPO}"
   maven: