[vFW CNF CDS] vf_module and vnf name generation improvment in CBA

[demo.git] / vnfs / vCPE / scripts / v_dns_install.sh

diff --git a/vnfs/vCPE/scripts/v_dns_install.sh b/vnfs/vCPE/scripts/v_dns_install.sh
index feaa770..dfb0e08 100644 (file)
--- a/vnfs/vCPE/scripts/v_dns_install.sh
+++ b/vnfs/vCPE/scripts/v_dns_install.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-REPO_URL_BLOB=$(cat /opt/config/repo_url_blob.txt)
-REPO_URL_ARTIFACTS=$(cat /opt/config/repo_url_artifacts.txt)
+NEXUS_ARTIFACT_REPO=$(cat /opt/config/nexus_artifact_repo.txt)
 DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt)
+if [[ "$DEMO_ARTIFACTS_VERSION" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
 INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt)
 CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
 
@@ -56,9 +56,9 @@ sleep 1
 
 # Download DNS and DHCP config files
 cd /opt
-wget $REPO_URL_BLOB/org.onap.demo/vnfs/vcpe/$INSTALL_SCRIPT_VERSION/kea-dhcp4_no_hook.conf
-wget $REPO_URL_BLOB/org.onap.demo/vnfs/vcpe/$INSTALL_SCRIPT_VERSION/v_dns_init.sh
-wget $REPO_URL_BLOB/org.onap.demo/vnfs/vcpe/$INSTALL_SCRIPT_VERSION/v_dns.sh
+unzip -p -j /opt/vcpe-scripts-$INSTALL_SCRIPT_VERSION.zip kea-dhcp4_no_hook.conf > /opt/kea-dhcp4_no_hook.conf
+unzip -p -j /opt/vcpe-scripts-$INSTALL_SCRIPT_VERSION.zip v_dns_init.sh > /opt/v_dns_init.sh
+unzip -p -j /opt/vcpe-scripts-$INSTALL_SCRIPT_VERSION.zip v_dns.sh > /opt/v_dns.sh
 mv kea-dhcp4_no_hook.conf /etc/kea/kea-dhcp4.conf
 chmod +x v_dns_init.sh
 chmod +x v_dns.sh
@@ -68,6 +68,13 @@ update-rc.d v_dns.sh defaults
 # Install Bind
 mkdir /etc/bind/zones
 sed -i "s/OPTIONS=.*/OPTIONS=\"-4 -u bind\"/g" /etc/default/bind9
+mv db_demo_onap_org /etc/bind/zones/db.demo.onap.org
+mv named.conf.options /etc/bind/
+mv named.conf.local /etc/bind/
+CPE_PUBLIC_IP=$(cat /opt/config/cpe_public_net_ipaddr.txt)
+sed -i "s/x.x.x.x/"$CPE_PUBLIC_IP"/g" /etc/bind/named.conf.options
+sleep 1
+
 
 # Rename network interface in openstack Ubuntu 16.04 images. Then, reboot the VM to pick up changes
 if [[ $CLOUD_ENV != "rackspace" ]]
@@ -81,4 +88,4 @@ then
        reboot
 fi
 
-./v_dns_init.sh
\ No newline at end of file
+./v_dns_init.sh