Use onap cli for registering services to msb

[demo.git] / boot / openo_install.sh

diff --git a/boot/openo_install.sh b/boot/openo_install.sh
index 0e5a4b9..24f84fd 100644 (file)
--- a/boot/openo_install.sh
+++ b/boot/openo_install.sh
@@ -12,39 +12,39 @@ VNFSDK_REPO=$(cat /opt/config/vnfsdk_repo.txt)
 # Add host name to /etc/host to avoid warnings in openstack images
 if [[ $CLOUD_ENV != "rackspace" ]]
 then
-       echo 127.0.0.1 $(hostname) >> /etc/hosts
+    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
+    # Allow remote login as root
+    mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk
+    cp /home/ubuntu/.ssh/authorized_keys /root/.ssh
 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/local_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
-       echo "    mtu $MTU" >> /etc/network/interfaces
-       ifup eth1
+    LOCAL_IP=$(cat /opt/config/local_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
+    echo "    mtu $MTU" >> /etc/network/interfaces
+    ifup eth1
 fi
 
 # Download dependencies
@@ -87,11 +87,11 @@ chmod +x /opt/docker/docker-compose
 DNS_FLAG=""
 if [ -s /opt/config/dns_ip_addr.txt ]
 then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/dns_ip_addr.txt) "
+    DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/dns_ip_addr.txt) "
 fi
 if [ -s /opt/config/external_dns.txt ]
 then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/external_dns.txt) "
+    DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/external_dns.txt) "
 fi
 echo "DOCKER_OPTS=\"$DNS_FLAG--mtu=$MTU\"" >> /etc/default/docker
 
@@ -106,18 +106,19 @@ resolvconf -u
 # Clone Gerrit repository and run docker containers
 cd /opt
 git clone -b $VNFSDK_BRANCH --single-branch $VNFSDK_REPO
-./cli_install.sh
+
+source ./cli_install.sh
 
 # Rename network interface in openstack Ubuntu 16.04 images. Then, reboot the VM to pick up changes
 if [[ $CLOUD_ENV != "rackspace" ]]
 then
-       sed -i "s/GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub
-       grub-mkconfig -o /boot/grub/grub.cfg
-       sed -i "s/ens[0-9]*/eth0/g" /etc/network/interfaces.d/*.cfg
-       sed -i "s/ens[0-9]*/eth0/g" /etc/udev/rules.d/70-persistent-net.rules
-       echo 'network: {config: disabled}' >> /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg
-       echo "APT::Periodic::Unattended-Upgrade \"0\";" >> /etc/apt/apt.conf.d/10periodic
-       reboot
+    sed -i "s/GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub
+    grub-mkconfig -o /boot/grub/grub.cfg
+    sed -i "s/ens[0-9]*/eth0/g" /etc/network/interfaces.d/*.cfg
+    sed -i "s/ens[0-9]*/eth0/g" /etc/udev/rules.d/70-persistent-net.rules
+    echo 'network: {config: disabled}' >> /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg
+    echo "APT::Periodic::Unattended-Upgrade \"0\";" >> /etc/apt/apt.conf.d/10periodic
+    reboot
 fi
 
 ./openo_all_serv.sh
\ No newline at end of file