use correct DCAE collector IP with DNS

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

diff --git a/boot/dns_install.sh b/boot/dns_install.sh
index 710ff98..1a3425f 100644 (file)
--- a/boot/dns_install.sh
+++ b/boot/dns_install.sh
@@ -48,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/"$(cat /opt/config/dcae_coll_float_ip.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
+       sed -i "s/dcae_coll_ip_addr/"$(cat /opt/config/dcae_coll_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
 fi
 
 # Configure Bind

diff --git a/heat/OpenECOMP/onap_openstack_RC.yaml b/heat/OpenECOMP/onap_openstack_RC.yaml
index cf1c864..1f62329 100644 (file)
--- a/heat/OpenECOMP/onap_openstack_RC.yaml
+++ b/heat/OpenECOMP/onap_openstack_RC.yaml
@@ -409,7 +409,7 @@ resources:
             __aai_ip_addr__: { get_param: aai_ip_addr }
             __appc_ip_addr__: { get_param: appc_ip_addr }
             __dcae_ip_addr__: { get_param: dcae_ip_addr }
-            __dcae_coll_float_ip__: { get_param: dcae_coll_float_ip }
+            __dcae_coll_ip_addr__: { get_param: dcae_coll_ipaddr }
             __mso_ip_addr__: { get_param: mso_ip_addr }
             __mr_ip_addr__: { get_param: mr_ip_addr }
             __policy_ip_addr__: { get_param: policy_ip_addr }
@@ -433,7 +433,7 @@ resources:
             echo "__aai_ip_addr__" > /opt/config/aai_ip_addr.txt
             echo "__appc_ip_addr__" > /opt/config/appc_ip_addr.txt
             echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt
-            echo "__dcae_coll_float_ip__" > /opt/config/dcae_coll_float_ip.txt
+            echo "__dcae_coll_ip_addr__" > /opt/config/dcae_coll_ip_addr.txt
             echo "__mso_ip_addr__" > /opt/config/mso_ip_addr.txt
             echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt
             echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt

diff --git a/heat/vLB/dnsscaling_rackspace.env b/heat/vLB/dnsscaling_rackspace.env
index fbf8bef..b93a6de 100644 (file)
--- a/heat/vLB/dnsscaling_rackspace.env
+++ b/heat/vLB/dnsscaling_rackspace.env
@@ -3,8 +3,8 @@ parameters:
   vlb_flavor_name: 4 GB General Purpose v1
   public_net_id: 00000000-0000-0000-0000-000000000000
   vlb_private_net_id: zdfw1lb01_private
-  ecomp_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
-  ecomp_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
+  onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
+  onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
   vlb_private_ip_0: 192.168.10.111
   vlb_private_ip_1: 10.1.0.4
   vdns_private_ip_0: 192.168.10.212