Add onap.org to DNS configuration

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

diff --git a/boot/bind_zones_onap b/boot/bind_zones_onap
new file mode 100644 (file)
index 0000000..30bc38a
--- /dev/null
+++ b/boot/bind_zones_onap
@@ -0,0 +1,143 @@
+;
+; BIND data file for local loopback interface
+;
+$TTL    604800
+@       IN      SOA     simpledemo.onap.org. admin.simpledemo.onap.org. (
+                        20170221        ; Serial
+                         604800         ; Refresh
+                          86400         ; Retry
+                        2419200         ; Expire
+                         604800 )       ; Negative Cache TTL
+;
+; name servers - NS records
+    IN      NS      simpledemo.onap.org.
+
+; name servers - A records
+simpledemo.onap.org.          IN      A       dns_ip_addr
+
+;
+vm1.aai.simpledemo.onap.org.       IN      A       aai1_ip_addr
+c1.vm1.aai.simpledemo.onap.org.    IN      A       aai1_ip_addr
+c2.vm1.aai.simpledemo.onap.org.    IN      A       aai1_ip_addr
+c3.vm1.aai.simpledemo.onap.org.    IN      A       aai1_ip_addr
+
+vm2.aai.simpledemo.onap.org.       IN      A       aai2_ip_addr
+c1.vm2.aai.simpledemo.onap.org.    IN      A       aai2_ip_addr
+c2.vm2.aai.simpledemo.onap.org.    IN      A       aai2_ip_addr
+c3.vm2.aai.simpledemo.onap.org.    IN      A       aai2_ip_addr
+
+vm1.appc.simpledemo.onap.org.      IN      A       appc_ip_addr
+c1.vm1.appc.simpledemo.onap.org.   IN      A       appc_ip_addr
+c2.vm1.appc.simpledemo.onap.org.   IN      A       appc_ip_addr
+
+vm1.sdc.simpledemo.onap.org.      IN      A       sdc_ip_addr
+c1.vm1.sdc.simpledemo.onap.org.   IN      A       sdc_ip_addr
+c2.vm1.sdc.simpledemo.onap.org.   IN      A       sdc_ip_addr
+c3.vm1.sdc.simpledemo.onap.org.   IN      A       sdc_ip_addr
+c4.vm1.sdc.simpledemo.onap.org.   IN      A       sdc_ip_addr
+
+vm1.dcae.simpledemo.onap.org.           IN      A       dcae_ip_addr
+c1.vm1.dcae.simpledemo.onap.org.        IN      A       dcae_ip_addr
+c2.vm1.dcae.simpledemo.onap.org.        IN      A       dcae_ip_addr
+c3.vm1.dcae.simpledemo.onap.org         IN      A       dcae_ip_addr
+
+vm1.mso.simpledemo.onap.org.       IN      A       so_ip_addr
+c1.vm1.mso.simpledemo.onap.org.    IN      A       so_ip_addr
+c1.vm1.mso.simpledemo.onap.org.    IN      A       so_ip_addr
+
+vm1.policy.simpledemo.onap.org.    IN      A       policy_ip_addr
+c1.vm1.policy.simpledemo.onap.org. IN      A       policy_ip_addr
+c2.vm1.policy.simpledemo.onap.org. IN      A       policy_ip_addr
+c3.vm1.policy.simpledemo.onap.org. IN      A       policy_ip_addr
+c4.vm1.policy.simpledemo.onap.org. IN      A       policy_ip_addr
+c5.vm1.policy.simpledemo.onap.org. IN      A       policy_ip_addr
+c6.vm1.policy.simpledemo.onap.org. IN      A       policy_ip_addr
+c7.vm1.policy.simpledemo.onap.org. IN      A       policy_ip_addr
+c8.vm1.policy.simpledemo.onap.org. IN      A       policy_ip_addr
+
+vm1.sdnc.simpledemo.onap.org.      IN      A       sdnc_ip_addr
+c1.vm1.sdnc.simpledemo.onap.org.   IN      A       sdnc_ip_addr
+c2.vm1.sdnc.simpledemo.onap.org.   IN      A       sdnc_ip_addr
+c3.vm1.sdnc.simpledemo.onap.org.   IN      A       sdnc_ip_addr
+c4.vm1.sdnc.simpledemo.onap.org.   IN      A       sdnc_ip_addr
+
+vm1.vid.simpledemo.onap.org.       IN      A       vid_ip_addr
+c1.vm1.vid.simpledemo.onap.org.    IN      A       vid_ip_addr
+c2.vm1.vid.simpledemo.onap.org.    IN      A       vid_ip_addr
+
+vm1.portal.simpledemo.onap.org.           IN      A       portal_ip_addr
+c1.vm1.portal.simpledemo.onap.org.        IN      A       portal_ip_addr
+c2.vm1.portal.simpledemo.onap.org.        IN      A       portal_ip_addr
+
+vm1.robot.simpledemo.onap.org.           IN      A       robot_ip_addr
+c1.vm1.robot.simpledemo.onap.org.        IN      A       robot_ip_addr
+c2.vm1.robot.simpledemo.onap.org.        IN      A       robot_ip_addr
+
+vm1.clamp.simpledemo.onap.org.           IN      A       clamp_ip_addr
+c1.vm1.clamp.simpledemo.onap.org.        IN      A       clamp_ip_addr
+c2.vm1.clamp.simpledemo.onap.org.        IN      A       clamp_ip_addr
+
+;vm1.aaf.simpledemo.onap.org.  IN      A       aaf_ip_addr
+
+vm1.mr.simpledemo.onap.org.    IN      A       mr_ip_addr
+
+vm1.openo.simpledemo.onap.org. IN  A   openo_ip_addr
+
+
+;CNAMES
+;A&AI
+aai.api.simpledemo.onap.org.   IN      CNAME   vm1.aai.simpledemo.onap.org.
+aai.ui.simpledemo.onap.org.    IN  CNAME   vm1.aai.simpledemo.onap.org.
+aai.searchservice.simpledemo.onap.org.     IN      CNAME   vm1.aai.simpledemo.onap.org.
+aai.hbase.simpledemo.onap.org. IN      CNAME   vm2.aai.simpledemo.onap.org.
+aai.gremlinserver.simpledemo.onap.org. IN      CNAME   vm2.aai.simpledemo.onap.org.
+aai.elasticsearch.simpledemo.onap.org. IN      CNAME   vm2.aai.simpledemo.onap.org.
+
+;APPC
+appc.api.simpledemo.onap.org.  IN      CNAME   vm1.appc.simpledemo.onap.org.
+
+;ASDC
+sdc.api.simpledemo.onap.org.   IN      CNAME   vm1.sdc.simpledemo.onap.org.    
+
+;DCAE
+dcae.api.simpledemo.onap.org.  IN      CNAME   vm1.dcae.simpledemo.onap.org.
+
+;SO
+mso.api.simpledemo.onap.org.   IN      CNAME   vm1.mso.simpledemo.onap.org.
+
+;Policy
+policy.api.simpledemo.onap.org.        IN      CNAME   vm1.policy.simpledemo.onap.org.
+
+;SDNC
+sdnc.api.simpledemo.onap.org.  IN      CNAME    vm1.sdnc.simpledemo.onap.org.
+
+;VID
+vid.api.simpledemo.onap.org.   IN      CNAME   vm1.vid.simpledemo.onap.org.    
+
+;PORTAL
+portal.api.simpledemo.onap.org.        IN      CNAME   vm1.portal.simpledemo.onap.org.
+
+;Message Router
+;mr.api.simpledemo.onap.org.   IN      CNAME   vm1.mr.simpledemo.onap.org.     
+ueb.api.simpledemo.onap.org.   IN      CNAME   vm1.mr.simpledemo.onap.org.
+mr.api.simpledemo.onap.org.        IN      A   dcae_coll_ip_addr
+collector.api.simpledemo.onap.org. IN      A   dcae_coll_ip_addr
+;dbc.api.simpledemo.onap.org.  IN      CNAME   vm1.mr.simpledemo.onap.org.
+;drprov.api.simpledemo.onap.org.       IN      CNAME   vm1.mr.simpledemo.onap.org.
+
+;CLAMP
+clamp.api.simpledemo.onap.org. IN      CNAME   vm1.clamp.simpledemo.onap.org.
+
+;ROBOT/SNIRO
+robot.api.simpledemo.onap.org. IN      CNAME   vm1.robot.simpledemo.onap.org.
+sniro.api.simpledemo.onap.org. IN      CNAME   vm1.robot.simpledemo.onap.org.
+
+;AAF
+;aaf.api.simpledemo.onap.org.  IN      CNAME   vm1.aaf.simpledemo.onap.org.
+
+;OPEN-O
+msb.api.simpledemo.onap.org.   IN      CNAME   vm1.openo.simpledemo.onap.org.
+mvim.api.simpledemo.onap.org.  IN      CNAME   vm1.openo.simpledemo.onap.org.
+vnfsdk.api.simpledemo.onap.org.        IN      CNAME   vm1.openo.simpledemo.onap.org.
+vfc.api.simpledemo.onap.org.   IN      CNAME   vm1.openo.simpledemo.onap.org.
+uui.api.simpledemo.onap.org.   IN      CNAME   vm1.openo.simpledemo.onap.org.

diff --git a/boot/db_simpledemo_onap_org b/boot/db_simpledemo_onap_org
new file mode 100644 (file)
index 0000000..ca583c9
--- /dev/null
+++ b/boot/db_simpledemo_onap_org
@@ -0,0 +1,134 @@
+;
+; BIND data file for local loopback interface
+;
+$TTL    604800
+@       IN      SOA     simpledemo.onap.org. admin.simpledemo.onap.org. (
+                        20170221        ; Serial
+                         604800         ; Refresh
+                          86400         ; Retry
+                        2419200         ; Expire
+                         604800 )       ; Negative Cache TTL
+;
+; name servers - NS records
+    IN      NS      simpledemo.onap.org.
+
+; name servers - A records
+simpledemo.onap.org.          IN      A       10.0.0.1
+
+;
+vm1.aai.simpledemo.onap.org.       IN      A       10.0.1.1
+c1.vm1.aai.simpledemo.onap.org.    IN      A       10.0.1.1
+c2.vm1.aai.simpledemo.onap.org.    IN      A       10.0.1.1
+c3.vm1.aai.simpledemo.onap.org.    IN      A       10.0.1.1
+
+vm2.aai.simpledemo.onap.org.       IN      A       10.0.1.2
+c1.vm2.aai.simpledemo.onap.org.    IN      A       10.0.1.2
+c2.vm2.aai.simpledemo.onap.org.    IN      A       10.0.1.2
+c3.vm2.aai.simpledemo.onap.org.    IN      A       10.0.1.2
+
+vm1.appc.simpledemo.onap.org.      IN      A       10.0.2.1
+c1.vm1.appc.simpledemo.onap.org.   IN      A       10.0.2.1
+c2.vm1.appc.simpledemo.onap.org.   IN      A       10.0.2.1
+
+vm1.sdc.simpledemo.onap.org.      IN      A       10.0.3.1
+c1.vm1.sdc.simpledemo.onap.org.   IN      A       10.0.3.1
+c2.vm1.sdc.simpledemo.onap.org.   IN      A       10.0.3.1
+c3.vm1.sdc.simpledemo.onap.org.   IN      A       10.0.3.1
+c4.vm1.sdc.simpledemo.onap.org.   IN      A       10.0.3.1
+
+vm1.dcae.simpledemo.onap.org.           IN      A       10.0.4.1
+c1.vm1.dcae.simpledemo.onap.org.        IN      A       10.0.4.1
+c2.vm1.dcae.simpledemo.onap.org.        IN      A       10.0.4.1
+c3.vm1.dcae.simpledemo.onap.org         IN      A       10.0.4.1
+
+vm1.mso.simpledemo.onap.org.       IN      A       10.0.5.1
+c1.vm1.mso.simpledemo.onap.org.    IN      A       10.0.5.1
+c1.vm1.mso.simpledemo.onap.org.    IN      A       10.0.5.1
+
+vm1.policy.simpledemo.onap.org.    IN      A       10.0.6.1
+c1.vm1.policy.simpledemo.onap.org. IN      A       10.0.6.1
+c2.vm1.policy.simpledemo.onap.org. IN      A       10.0.6.1
+c3.vm1.policy.simpledemo.onap.org. IN      A       10.0.6.1
+c4.vm1.policy.simpledemo.onap.org. IN      A       10.0.6.1
+c5.vm1.policy.simpledemo.onap.org. IN      A       10.0.6.1
+c6.vm1.policy.simpledemo.onap.org. IN      A       10.0.6.1
+c7.vm1.policy.simpledemo.onap.org. IN      A       10.0.6.1
+c8.vm1.policy.simpledemo.onap.org. IN      A       10.0.6.1
+
+vm1.sdnc.simpledemo.onap.org.      IN      A       10.0.7.1
+c1.vm1.sdnc.simpledemo.onap.org.   IN      A       10.0.7.1
+c2.vm1.sdnc.simpledemo.onap.org.   IN      A       10.0.7.1
+c3.vm1.sdnc.simpledemo.onap.org.   IN      A       10.0.7.1
+c4.vm1.sdnc.simpledemo.onap.org.   IN      A       10.0.7.1
+
+vm1.vid.simpledemo.onap.org.       IN      A       10.0.8.1
+c1.vm1.vid.simpledemo.onap.org.    IN      A       10.0.8.1
+c2.vm1.vid.simpledemo.onap.org.    IN      A       10.0.8.1
+
+vm1.portal.simpledemo.onap.org.           IN      A       10.0.9.1
+c1.vm1.portal.simpledemo.onap.org.        IN      A       10.0.9.1
+c2.vm1.portal.simpledemo.onap.org.        IN      A       10.0.9.1
+
+vm1.robot.simpledemo.onap.org.           IN      A       10.0.10.1
+c1.vm1.robot.simpledemo.onap.org.        IN      A       10.0.10.1
+c2.vm1.robot.simpledemo.onap.org.        IN      A       10.0.10.1
+
+vm1.aaf.simpledemo.onap.org.   IN      A       10.0.13.1
+
+vm1.mr.simpledemo.onap.org.    IN      A       10.0.11.1
+
+vm1.clamp.simpledemo.onap.org.           IN      A       10.0.12.1
+c1.vm1.clamp.simpledemo.onap.org.        IN      A       10.0.12.1
+c2.vm1.clamp.simpledemo.onap.org.        IN      A       10.0.12.1
+
+
+;CNAMES
+;A&AI
+aai.api.simpledemo.onap.org.   IN      CNAME   vm1.aai.simpledemo.onap.org.
+aai.ui.simpledemo.onap.org.    IN  CNAME   vm1.aai.simpledemo.onap.org.
+aai.searchservice.simpledemo.onap.org.     IN      CNAME   vm1.aai.simpledemo.onap.org.
+aai.hbase.simpledemo.onap.org. IN      CNAME   vm2.aai.simpledemo.onap.org.
+aai.gremlinserver.simpledemo.onap.org. IN      CNAME   vm2.aai.simpledemo.onap.org.
+aai.elasticsearch.simpledemo.onap.org. IN      CNAME   vm2.aai.simpledemo.onap.org.
+
+;APPC
+appc.api.simpledemo.onap.org.  IN      CNAME   vm1.appc.simpledemo.onap.org.
+
+;ASDC
+sdc.api.simpledemo.onap.org.   IN      CNAME   vm1.sdc.simpledemo.onap.org.    
+
+;DCAE
+dcae.api.simpledemo.onap.org.  IN      CNAME   vm1.dcae.simpledemo.onap.org.
+
+;MSO
+mso.api.simpledemo.onap.org.   IN      CNAME   vm1.mso.simpledemo.onap.org.
+
+;Policy
+policy.api.simpledemo.onap.org.        IN      CNAME   vm1.policy.simpledemo.onap.org.
+
+;SDNC
+sdnc.api.simpledemo.onap.org.  IN      CNAME    vm1.sdnc.simpledemo.onap.org.
+
+;VID
+vid.api.simpledemo.onap.org.   IN      CNAME   vm1.vid.simpledemo.onap.org.    
+
+;PORTAL
+portal.api.simpledemo.onap.org.        IN      CNAME   vm1.portal.simpledemo.onap.org.
+
+;Message Router
+;mr.api.simpledemo.onap.org.   IN      CNAME   vm1.mr.simpledemo.onap.org.     
+ueb.api.simpledemo.onap.org.   IN      CNAME   vm1.mr.simpledemo.onap.org.
+mr.api.simpledemo.onap.org.        IN      A   10.0.4.102
+collector.api.simpledemo.onap.org. IN      A   10.0.4.102
+;dbc.api.simpledemo.onap.org.  IN      CNAME   vm1.mr.simpledemo.onap.org.
+;drprov.api.simpledemo.onap.org.       IN      CNAME   vm1.mr.simpledemo.onap.org.
+
+;ROBOT/SNIRO
+robot.api.simpledemo.onap.org. IN      CNAME   vm1.robot.simpledemo.onap.org.
+sniro.api.simpledemo.onap.org. IN      CNAME   vm1.robot.simpledemo.onap.org.
+
+;CLAMP
+clamp.api.simpledemo.onap.org. IN      CNAME   vm1.clamp.simpledemo.onap.org.
+
+;AAF
+aaf.api.simpledemo.onap.org.   IN      CNAME   vm1.aaf.simpledemo.onap.org.

diff --git a/boot/dns_install.sh b/boot/dns_install.sh
index 27ea223..78bf76d 100644 (file)
--- a/boot/dns_install.sh
+++ b/boot/dns_install.sh
@@ -9,16 +9,18 @@ if [[ $CLOUD_ENV != "rackspace" ]]
 then
        # Add host name to /etc/host to avoid warnings in openstack images
        echo 127.0.0.1 $(hostname) >> /etc/hosts
-       
+
        # Allow remote login as root
        mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk
        cp /home/ubuntu/.ssh/authorized_keys /root/.ssh
 
        # Set the Bind configuration file name based on the deployment environment
        ZONE_FILE="bind_zones"
+       ZONE_ONAP="bind_zones_onap"
        OPTIONS_FILE="bind_options"
 else
        ZONE_FILE="db_simpledemo_openecomp_org"
+       ZONE_ONAP="db_simpledemo_onap_org"
        OPTIONS_FILE="named.conf.options"
 fi
 
@@ -58,6 +60,7 @@ apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates w
 # Download script
 mkdir /etc/bind/zones
 curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/$ZONE_FILE -o /etc/bind/zones/db.simpledemo.openecomp.org
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/$ZONE_ONAP -o /etc/bind/zones/db.simpledemo.onap.org
 curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/$OPTIONS_FILE -o /etc/bind/named.conf.options
 curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/named.conf.local -o /etc/bind/named.conf.local
 
@@ -82,6 +85,23 @@ then
        sed -i "s/dcae_coll_ip_addr/"$(cat /opt/config/dcae_coll_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
        sed -i "s/clamp_ip_addr/"$(cat /opt/config/clamp_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
        sed -i "s/openo_ip_addr/"$(cat /opt/config/openo_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
+       sed -i "s/appc_ip_addr/"$(cat /opt/config/appc_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
+       sed -i "s/dcae_ip_addr/"$(cat /opt/config/dcae_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
+       sed -i "s/dns_ip_addr/"$(cat /opt/config/dns_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
+       sed -i "s/so_ip_addr/"$(cat /opt/config/so_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
+       sed -i "s/mr_ip_addr/"$(cat /opt/config/mr_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
+       sed -i "s/policy_ip_addr/"$(cat /opt/config/policy_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
+       sed -i "s/portal_ip_addr/"$(cat /opt/config/portal_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
+       sed -i "s/robot_ip_addr/"$(cat /opt/config/robot_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
+       sed -i "s/sdc_ip_addr/"$(cat /opt/config/sdc_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
+       sed -i "s/sdnc_ip_addr/"$(cat /opt/config/sdnc_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
+       sed -i "s/vid_ip_addr/"$(cat /opt/config/vid_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
+       sed -i "s/dcae_coll_ip_addr/"$(cat /opt/config/dcae_coll_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
+       sed -i "s/clamp_ip_addr/"$(cat /opt/config/clamp_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
+       sed -i "s/openo_ip_addr/"$(cat /opt/config/openo_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
 fi
 
 # Configure Bind

diff --git a/boot/named.conf.local b/boot/named.conf.local
index c7c82f3..f372cba 100644 (file)
--- a/boot/named.conf.local
+++ b/boot/named.conf.local
@@ -10,3 +10,8 @@ zone "simpledemo.openecomp.org" {
     type master;
     file "/etc/bind/zones/db.simpledemo.openecomp.org"; # zone file path
 };
+
+zone "simpledemo.onap.org" {
+    type master;
+    file "/etc/bind/zones/db.simpledemo.onap.org"; # zone file path
+};