From 6bc210d65d1d4d3847b65af847245a258c66c284 Mon Sep 17 00:00:00 2001 From: Carsten Lund Date: Tue, 9 May 2017 17:43:36 +0000 Subject: [DCAE-7] updates for parameterized flavor/images Change-Id: I867b163fa8fdc47674f821089134dbb91f5d53a9 Signed-off-by: Carsten Lund --- OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml | 4 ++-- OPENECOMP-DEMO/vm-templates/vm-controller.yaml | 4 ++-- OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml | 4 ++-- OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'OPENECOMP-DEMO') 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: -- cgit 1.2.3-korg