Add floating IPs for DCAE

Change-Id: I3996a21ec735a0ad14d5e42e67d006063f9db72c
Signed-off-by: Marco Platania <platania@research.att.com>
(cherry picked from commit 6f86bee471736d25c9f0815477f308c79833a2ee)

diff --git a/boot/bind_zones b/boot/bind_zones
index 83214fb..e73234f 100644 (file)
--- a/boot/bind_zones
+++ b/boot/bind_zones
@@ -101,8 +101,8 @@ portal.api.simpledemo.openecomp.org.        IN      CNAME   vm1.portal.simpledemo.openecomp.or
 ;Message Router
 ;mr.api.simpledemo.openecomp.org.      IN      CNAME   vm1.mr.simpledemo.openecomp.org.        
 ueb.api.simpledemo.openecomp.org.      IN      CNAME   vm1.mr.simpledemo.openecomp.org.
-mr.api.simpledemo.openecomp.org.        IN      A   dcae_coll_ip_addr.102
-collector.api.simpledemo.openecomp.org. IN      A   dcae_coll_ip_addr.102
+mr.api.simpledemo.openecomp.org.        IN      A   dcae_coll_ip_addr
+collector.api.simpledemo.openecomp.org. IN      A   dcae_coll_ip_addr
 ;dbc.api.simpledemo.openecomp.org.     IN      CNAME   vm1.mr.simpledemo.openecomp.org.
 ;drprov.api.simpledemo.openecomp.org.  IN      CNAME   vm1.mr.simpledemo.openecomp.org.
 

diff --git a/boot/dcae_install.sh b/boot/dcae_install.sh
index 54d135d..f9de935 100644 (file)
--- a/boot/dcae_install.sh
+++ b/boot/dcae_install.sh
@@ -25,6 +25,13 @@ NEXUS_USER=$(cat /opt/config/nexus_username.txt)
 NEXUS_PASSWORD=$(cat /opt/config/nexus_password.txt)
 NEXUS_URL_SNAPSHOTS=$(cat /opt/config/nexus_url_snapshots.txt)
 DOCKER_REGISTRY=$(cat /opt/config/nexus_docker_repo.txt)
+DCAE_CODE_VERSION=$(cat /opt/config/dcae_code_version.txt)
+
+DCAE_COLL_FLOAT_IP=$(cat /opt/config/dcae_coll_float_ip.txt)
+DCAE_DB_FLOAT_IP=$(cat /opt/config/dcae_db_float_ip.txt)
+DCAE_HDP1_FLOAT_IP=$(cat /opt/config/dcae_hdp1_float_ip.txt)
+DCAE_HDP2_FLOAT_IP=$(cat /opt/config/dcae_hdp2_float_ip.txt)
+DCAE_HDP3_FLOAT_IP=$(cat /opt/config/dcae_hdp3_float_ip.txt)
 
 # Add host name to /etc/host to avoid warnings in openstack images
 if [[ $CLOUD_ENV == "openstack" ]]
@@ -72,7 +79,7 @@ mkdir -p /opt/app/dcae-controller
 cat > /opt/app/dcae-controller/config.yaml << EOF_CONFIG
 ZONE: $ZONE
 STATE: $STATE
-DCAE-VERSION: $ARTIFACTS_VERSION
+DCAE-VERSION: $DCAE_CODE_VERSION
 HORIZON-URL: $HORIZON_URL/$OPENSTACK_USER
 KEYSTONE-URL: $KEYSTONE_URL
 OPENSTACK-TENANT-ID: $OPENSTACK_TENANT_ID

diff --git a/boot/dns_install.sh b/boot/dns_install.sh
index ca5e894..710ff98 100644 (file)
--- a/boot/dns_install.sh
+++ b/boot/dns_install.sh
@@ -36,9 +36,6 @@ curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/named.conf.local
 if [[ $CLOUD_ENV == "openstack" ]]
 then
        sed -i "s/dns_ip_addr/"$(cat /opt/config/dns_ip_addr.txt)"/g" /etc/bind/named.conf.options
-       A=$(cat /opt/config/dcae_ip_addr.txt | cut -d"." -f1)
-       B=$(cat /opt/config/dcae_ip_addr.txt | cut -d"." -f2)
-       C=$(cat /opt/config/dcae_ip_addr.txt | cut -d"." -f3)
        sed -i "s/aai_ip_addr/"$(cat /opt/config/aai_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
        sed -i "s/appc_ip_addr/"$(cat /opt/config/appc_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
        sed -i "s/dcae_ip_addr/"$(cat /opt/config/dcae_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
@@ -51,7 +48,7 @@ then
        sed -i "s/sdc_ip_addr/"$(cat /opt/config/sdc_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
        sed -i "s/sdnc_ip_addr/"$(cat /opt/config/sdnc_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
        sed -i "s/vid_ip_addr/"$(cat /opt/config/vid_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
-       sed -i "s/dcae_coll_ip_addr/"$A.$B.$C"/g" /etc/bind/zones/db.simpledemo.openecomp.org
+       sed -i "s/dcae_coll_ip_addr/"$(cat /opt/config/dcae_coll_float_ip.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
 fi
 
 # Configure Bind