X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=boot%2Fmusic_install.sh;h=84ba562906e14b3135504caed586683acc0a5793;hb=d4c5f6b933e2ba449cb1ddf39355f03affec9b53;hp=f01e35511bf550047a10bb89fc0b5d8fb5d86a35;hpb=62347152ef6e9d284d8bc45373fb6f83a5162110;p=demo.git

diff --git a/boot/music_install.sh b/boot/music_install.sh
index f01e3551..84ba5629 100644
--- a/boot/music_install.sh
+++ b/boot/music_install.sh
@@ -26,45 +26,18 @@ then
 	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
-fi
-
 # Download dependencies
 apt-get update
 apt-get install -y apt-transport-https ca-certificates wget git ntp ntpdate make
 
 # Download scripts from Nexus
 unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip music_vm_init.sh > /opt/music_vm_init.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip music_serv.sh > /opt/music_serv.sh
+unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip serv.sh > /opt/music_serv.sh
 unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip imagetest.sh > /opt/imagetest.sh
 chmod +x /opt/imagetest.sh
 chmod +x /opt/music_vm_init.sh
 chmod +x /opt/music_serv.sh
+sed -i "s|cmd=\"\"|cmd=\"./music_vm_init.sh\"|g" /opt/music_serv.sh
 mv /opt/music_serv.sh /etc/init.d
 update-rc.d music_serv.sh defaults