[DCAE-7] Pass image names and flavors to DCAE

Change-Id: Ifa2626f58c86fe41340f30cc7b66690bd93f1c9b
Signed-off-by: Marco Platania <platania@research.att.com>

diff --git a/boot/dcae_install.sh b/boot/dcae_install.sh
index 45e7437..6ea93ff 100644 (file)
--- a/boot/dcae_install.sh
+++ b/boot/dcae_install.sh
@@ -38,13 +38,6 @@ DCAE_HDP1_IP_ADDR=$(cat /opt/config/dcae_hdp1_ip_addr.txt)
 DCAE_HDP2_IP_ADDR=$(cat /opt/config/dcae_hdp2_ip_addr.txt)
 DCAE_HDP3_IP_ADDR=$(cat /opt/config/dcae_hdp3_ip_addr.txt)
 
-UBUNTU_1404_IMAGE=$(cat /opt/config/ubuntu_1404_image.txt)
-UBUNTU_1604_IMAGE=$(cat /opt/config/ubuntu_1604_image.txt)
-FLAVOR_SMALL=$(cat /opt/config/flavor_small.txt)
-FLAVOR_MEDIUM=$(cat /opt/config/flavor_medium.txt)
-FLAVOR_LARGE=$(cat /opt/config/flavor_large.txt)
-FLAVOR_XLARGE=$(cat /opt/config/flavor_xlarge.txt)
-
 if [[ $CLOUD_ENV != "rackspace" ]]
 then
        # Add host name to /etc/host to avoid warnings in openstack images
@@ -162,13 +155,28 @@ dcae_cdap00_ip_addr: $DCAE_HDP1_IP_ADDR
 dcae_cdap01_ip_addr: $DCAE_HDP2_IP_ADDR
 dcae_cdap02_ip_addr: $DCAE_HDP3_IP_ADDR
 
+EOF_CONFIG
+
+# For non-Rackspace environment DCAE needs the OS image names and flavors
+if [[ $CLOUD_ENV != "rackspace" ]]
+then
+       UBUNTU_1404_IMAGE=$(cat /opt/config/ubuntu_1404_image.txt)
+       UBUNTU_1604_IMAGE=$(cat /opt/config/ubuntu_1604_image.txt)
+       FLAVOR_SMALL=$(cat /opt/config/flavor_small.txt)
+       FLAVOR_MEDIUM=$(cat /opt/config/flavor_medium.txt)
+       FLAVOR_LARGE=$(cat /opt/config/flavor_large.txt)
+       FLAVOR_XLARGE=$(cat /opt/config/flavor_xlarge.txt)
+
+cat >> /opt/app/dcae-controller/config.yaml << EOF_CONFIG
 UBUNTU-1404-IMAGE: $UBUNTU_1404_IMAGE
 UBUNTU-1604-IMAGE: $UBUNTU_1604_IMAGE
 FLAVOR-SMALL: $FLAVOR_SMALL
 FLAVOR-MEDIUM: $FLAVOR_MEDIUM
 FLAVOR-LARGE: $FLAVOR_LARGE
 FLAVOR-XLARGE: $FLAVOR_XLARGE
+
 EOF_CONFIG
+fi
 
 # Add floating IP section to DCAE config file for OpenStack deployments that use floating IPs
 if [[ $CLOUD_ENV == "openstack" ]]
@@ -182,7 +190,6 @@ then
        DCAE_HDP3_FLOAT_IP=$(cat /opt/config/dcae_hdp3_float_ip.txt)
 
 cat >> /opt/app/dcae-controller/config.yaml << EOF_CONFIG
-
 dcae_float_ip_addr: $DCAE_FLOAT_IP_ADDR
 dcae_pstg00_float_ip_addr: $DCAE_DB_FLOAT_IP
 dcae_coll00_float_ip_addr: $DCAE_COLL_FLOAT_IP

diff --git a/heat/OpenECOMP/onap_rackspace.env b/heat/OpenECOMP/onap_rackspace.env
index 3a148ac..0afc1ca 100644 (file)
--- a/heat/OpenECOMP/onap_rackspace.env
+++ b/heat/OpenECOMP/onap_rackspace.env
@@ -39,7 +39,7 @@ parameters:
 
   # Parameters for DCAE instantiation
 
-  dcae_base_environment: 2-NIC
+  dcae_base_environment: RACKSPACE
 
   dcae_zone: iad4