From: Marco Platania Date: Fri, 5 May 2017 20:07:09 +0000 (-0400) Subject: Change DCAE config file layout X-Git-Tag: 1.0.0-Amsterdam~313 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=ec5429d169822eb690a1b564387040ac717868fb;p=demo.git Change DCAE config file layout Change-Id: Idaecf22f8182152458ef07c6b95209bc824dfb73 Signed-off-by: Marco Platania --- diff --git a/boot/dcae_install.sh b/boot/dcae_install.sh index 8ec7edbd..94d73e11 100644 --- a/boot/dcae_install.sh +++ b/boot/dcae_install.sh @@ -140,7 +140,6 @@ dcae_coll00_ip_addr: $DCAE_COLL_IP_ADDR 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 # Add floating IP section to DCAE config file for OpenStack deployments that use floating IPs @@ -154,14 +153,14 @@ then DCAE_HDP2_FLOAT_IP=$(cat /opt/config/dcae_hdp2_float_ip.txt) DCAE_HDP3_FLOAT_IP=$(cat /opt/config/dcae_hdp3_float_ip.txt) - cat >> /opt/app/dcae-controller/config.yaml << EOF_CONFIG +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 - dcae_cdap00_float_ip_addr: $DCAE_HDP1_FLOAT_IP - dcae_cdap01_float_ip_addr: $DCAE_HDP2_FLOAT_IP - dcae_cdap02_float_ip_addr: $DCAE_HDP3_FLOAT_IP +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 +dcae_cdap00_float_ip_addr: $DCAE_HDP1_FLOAT_IP +dcae_cdap01_float_ip_addr: $DCAE_HDP2_FLOAT_IP +dcae_cdap02_float_ip_addr: $DCAE_HDP3_FLOAT_IP EOF_CONFIG fi