Add NBI configuration to DNS

Change-Id: I456d612171ab6f00a7f0390b585ea6208e047918
Issue-ID: INT-456
Signed-off-by: Marco Platania <platania@research.att.com>

diff --git a/boot/bind_zones b/boot/bind_zones
index 1dfd6d0..bfdbcb5 100644 (file)
--- a/boot/bind_zones
+++ b/boot/bind_zones
@@ -87,6 +87,8 @@ vm1.music.simpledemo.openecomp.org. IN  A   music_ip_addr
 
 vm1.oof.simpledemo.openecomp.org. IN  A   oof_ip_addr
 
+vm1.nbi.simpledemo.openecomp.org. IN  A   nbi_ip_addr
+
 
 ;CNAMES
 ;A&AI
@@ -149,4 +151,7 @@ esr.api.simpledemo.openecomp.org.   IN      CNAME   vm1.openo.simpledemo.openecomp.org
 music.api.simpledemo.openecomp.org.    IN      CNAME   vm1.music.simpledemo.openecomp.org.
 
 ;OOF
-oof.api.simpledemo.openecomp.org.      IN      CNAME   vm1.oof.simpledemo.openecomp.org.
\ No newline at end of file
+oof.api.simpledemo.openecomp.org.      IN      CNAME   vm1.oof.simpledemo.openecomp.org.
+
+;NBI
+nbi.api.simpledemo.openecomp.org.      IN      CNAME   vm1.nbi.simpledemo.openecomp.org.
\ No newline at end of file

diff --git a/boot/bind_zones_onap b/boot/bind_zones_onap
index 425f3d1..b5a1357 100644 (file)
--- a/boot/bind_zones_onap
+++ b/boot/bind_zones_onap
@@ -87,6 +87,8 @@ vm1.music.simpledemo.openecomp.org. IN  A   music_ip_addr
 
 vm1.oof.simpledemo.openecomp.org. IN  A   oof_ip_addr
 
+vm1.nbi.simpledemo.openecomp.org. IN  A   nbi_ip_addr
+
 
 ;CNAMES
 ;A&AI
@@ -149,4 +151,7 @@ esr.api.simpledemo.onap.org.        IN      CNAME   vm1.openo.simpledemo.onap.org.
 music.api.simpledemo.onap.org. IN      CNAME   vm1.music.simpledemo.onap.org.
 
 ;OOF
-oof.api.simpledemo.onap.org.   IN      CNAME   vm1.oof.simpledemo.onap.org.
\ No newline at end of file
+oof.api.simpledemo.onap.org.   IN      CNAME   vm1.oof.simpledemo.onap.org.
+
+;NBI
+nbi.api.simpledemo.onap.org.   IN      CNAME   vm1.nbi.simpledemo.onap.org.
\ No newline at end of file

diff --git a/boot/db_simpledemo_onap_org b/boot/db_simpledemo_onap_org
index c3a2df8..d5c3f8a 100644 (file)
--- a/boot/db_simpledemo_onap_org
+++ b/boot/db_simpledemo_onap_org
@@ -87,6 +87,8 @@ vm1.music.simpledemo.onap.org.        IN      A       10.0.15.1
 
 vm1.oof.simpledemo.onap.org.   IN      A       10.0.16.1
 
+vm1.nbi.simpledemo.onap.org.   IN      A       10.0.17.1
+
 
 ;CNAMES
 ;A&AI
@@ -151,4 +153,7 @@ esr.api.simpledemo.onap.org.        IN      CNAME   vm1.openo.simpledemo.onap.org.
 music.api.simpledemo.onap.org. IN      CNAME   vm1.music.simpledemo.onap.org.
 
 ;OOF
-oof.api.simpledemo.onap.org.   IN      CNAME   vm1.oof.simpledemo.onap.org.
\ No newline at end of file
+oof.api.simpledemo.onap.org.   IN      CNAME   vm1.oof.simpledemo.onap.org.
+
+;NBI
+nbi.api.simpledemo.onap.org.   IN      CNAME   vm1.nbi.simpledemo.onap.org.
\ No newline at end of file

diff --git a/boot/db_simpledemo_openecomp_org b/boot/db_simpledemo_openecomp_org
index e867a26..e3fa1f6 100644 (file)
--- a/boot/db_simpledemo_openecomp_org
+++ b/boot/db_simpledemo_openecomp_org
@@ -87,6 +87,8 @@ vm1.music.simpledemo.openecomp.org.   IN      A       10.0.15.1
 
 vm1.oof.simpledemo.openecomp.org.      IN      A       10.0.16.1
 
+vm1.nbi.simpledemo.openecomp.org.      IN      A       10.0.17.1
+
 
 ;CNAMES
 ;A&AI
@@ -152,3 +154,6 @@ music.api.simpledemo.openecomp.org. IN      CNAME   vm1.music.simpledemo.openecomp.org.
 
 ;OOF
 oof.api.simpledemo.openecomp.org.      IN      CNAME   vm1.oof.simpledemo.openecomp.org.
+
+;NBI
+nbi.api.simpledemo.openecomp.org.      IN      CNAME   vm1.nbi.simpledemo.openecomp.org.
\ No newline at end of file

diff --git a/boot/dns_install.sh b/boot/dns_install.sh
index 239bfce..fbe3df7 100644 (file)
--- a/boot/dns_install.sh
+++ b/boot/dns_install.sh
@@ -91,6 +91,7 @@ then
        sed -i "s/music_ip_addr/"$(cat /opt/config/music_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
        sed -i "s/oof_ip_addr/"$(cat /opt/config/oof_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
        sed -i "s/aaf_ip_addr/"$(cat /opt/config/aaf_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
+       sed -i "s/aaf_ip_addr/"$(cat /opt/config/nbi_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
 
        sed -i "s/aai1_ip_addr/"$(cat /opt/config/aai1_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
        sed -i "s/aai2_ip_addr/"$(cat /opt/config/aai2_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
@@ -110,6 +111,7 @@ then
        sed -i "s/music_ip_addr/"$(cat /opt/config/music_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
        sed -i "s/oof_ip_addr/"$(cat /opt/config/oof_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
        sed -i "s/aaf_ip_addr/"$(cat /opt/config/aaf_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
+       sed -i "s/aaf_ip_addr/"$(cat /opt/config/nbi_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
 fi
 
 # Configure Bind

diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 69d35e3..0566e97 100644 (file)
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -551,6 +551,7 @@ resources:
             __music_ip_addr__: { get_param: music_ip_addr }
             __oof_ip_addr__: { get_param: oof_ip_addr }
             __aaf_ip_addr__: { get_param: aaf_ip_addr }
+            __nbi_ip_addr__: { get_param: nbi_ip_addr }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
             __dns_forwarder__: { get_param: dns_forwarder }
@@ -581,6 +582,7 @@ resources:
             echo "__music_ip_addr__" > /opt/config/music_ip_addr.txt
             echo "__oof_ip_addr__" > /opt/config/oof_ip_addr.txt
             echo "__aaf_ip_addr__" > /opt/config/aaf_ip_addr.txt
+            echo "__nbi_ip_addr__" > /opt/config/nbi_ip_addr.txt
             echo "__external_dns__" > /opt/config/external_dns.txt
             echo "__dns_forwarder__" > /opt/config/dns_forwarder.txt