aboutsummaryrefslogtreecommitdiffstats
path: root/boot/dns_install.sh
diff options
context:
space:
mode:
Diffstat (limited to 'boot/dns_install.sh')
-rw-r--r--boot/dns_install.sh31
1 files changed, 1 insertions, 30 deletions
diff --git a/boot/dns_install.sh b/boot/dns_install.sh
index 55b24958..1f940ac3 100644
--- a/boot/dns_install.sh
+++ b/boot/dns_install.sh
@@ -32,33 +32,6 @@ else
OPTIONS_FILE="named.conf.options"
fi
-# Set private IP in /etc/network/interfaces manually in the presence of public interface
-# Some VM images don't add the private interface automatically, we have to do it during the component installation
-if [[ $CLOUD_ENV == "openstack_nofloat" ]]
-then
- LOCAL_IP=$(cat /opt/config/dns_ip_addr.txt)
- CIDR=$(cat /opt/config/oam_network_cidr.txt)
- BITMASK=$(echo $CIDR | cut -d"/" -f2)
-
- # Compute the netmask based on the network cidr
- if [[ $BITMASK == "8" ]]
- then
- NETMASK=255.0.0.0
- elif [[ $BITMASK == "16" ]]
- then
- NETMASK=255.255.0.0
- elif [[ $BITMASK == "24" ]]
- then
- NETMASK=255.255.255.0
- fi
-
- echo "auto eth1" >> /etc/network/interfaces
- echo "iface eth1 inet static" >> /etc/network/interfaces
- echo " address $LOCAL_IP" >> /etc/network/interfaces
- echo " netmask $NETMASK" >> /etc/network/interfaces
- ifup eth1
-fi
-
# Download dependencies
apt-get update
apt-get install -y apt-transport-https ca-certificates wget bind9 bind9utils bind9-doc ntp ntpdate make
@@ -70,12 +43,10 @@ unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip $ZONE_ONAP > /etc/bind/zones/db.sim
unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip $OPTIONS_FILE > /etc/bind/named.conf.options
unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip named.conf.local > /etc/bind/named.conf.local
-
-
# Set the private IP address of each ONAP VM in the Bind configuration in OpenStack deployments
if [[ $CLOUD_ENV != "rackspace" ]]
then
- sed -i "s/dns_forwarder/"$(cat /opt/config/dns_forwarder.txt)"/g" /etc/bind/named.conf.options
+ sed -i "s/dns_forwarder/"$(cat /opt/config/dns_forwarder.txt)"/g" /etc/bind/named.conf.options
sed -i "s/dns_ip_addr/"$(cat /opt/config/dns_ip_addr.txt)"/g" /etc/bind/named.conf.options
sed -i "s/external_dns/"$(cat /opt/config/external_dns.txt)"/g" /etc/bind/named.conf.options
sed -i "s/aai1_ip_addr/"$(cat /opt/config/aai1_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org