Merge "SM-Storage: Change the ip-address/mac address and changed rout…

…e addition."
Juniper · Feb 23, 2015 · b7e20f9 · b7e20f9
2 parents f20080d + 7a8c697
commit b7e20f9
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 18 deletions.
diff --git a/contrail/environment/modules/contrail/files/config-storage-live-migration.sh b/contrail/environment/modules/contrail/files/config-storage-live-migration.sh
@@ -196,7 +196,7 @@ if [ -z ${LIVE_MIGRATE_SUBNET} ]
 then
   ## as of now, we have fixed subnet to 192.168.101.0/24.
   ## TODO: take subnet as argument
-  neutron subnet-create --name livemnfs livemnfs 192.168.101.0/24
+  neutron subnet-create --name livemnfs livemnfs 192.168.101.0/24 
   RETVAL=$?
   if [ ${RETVAL} -ne 0 ] 
   then
@@ -270,13 +270,13 @@ fi
 ## checking if route is already present ?
 ## TODO: we are using FIXED ip address right now. move this to
 ## TODO: dynamic ip address.
-netstat -nr | grep 192.168.101.101 | grep -q ${NOVA_HOST_IP}
+netstat -nr | grep 192.168.101.3 | grep -q ${NOVA_HOST_IP}
 RETVAL=$?
 if [ ${RETVAL} -ne 0 ] 
 then
   echo "route check failed"
   ## add the route
-  route add 192.168.101.101 gw ${NOVA_HOST_IP}
+  route add 192.168.101.3 gw ${NOVA_HOST_IP}
   RETVAL=$?
   if [ ${RETVAL} -ne 0 ] 
   then
@@ -287,12 +287,12 @@ fi
 
 ## Check if route is added to startup scripts. this is required 
 ## to bring-up route on system start-up
-grep -q "up route add 192.168.101.101 gw ${NOVA_HOST_IP}" /etc/network/interfaces
+grep -q "up route add 192.168.101.3 gw ${NOVA_HOST_IP}" /etc/network/interfaces
 RETVAL=$?
 if [ ${RETVAL} -ne 0 ] 
 then
   echo "route not there in net-interfaces"
-  echo "up route add 192.168.101.101 gw ${NOVA_HOST_IP}" >> /etc/network/interfaces
+  echo "up route add 192.168.101.3 gw ${NOVA_HOST_IP}" >> /etc/network/interfaces
 fi
 
 

diff --git a/contrail/environment/modules/contrail/files/config-storage-lm-compute.sh b/contrail/environment/modules/contrail/files/config-storage-lm-compute.sh
@@ -45,6 +45,19 @@ then
   exit 0
 fi
 
+## Check if we are able to resolve ip address of nova-host
+host ${VM_HOSTNAME}
+RETVAL=$?
+if [ ${RETVAL} -ne 0 ]
+then
+  echo "host resolution failed"
+  exit 1
+fi
+
+## Get the ip address of nova-host.
+## NOTE: we already checked about the ip resolution. so awk must
+## NOTE: give correct results
+NOVA_HOST_IP=`host ${VM_HOSTNAME} | awk '{printf $4}'`
 
 ## Get the configured value of live_migration_flag. Checking this value will
 ## help to identify if values has been configured or not. if yes, no need to
@@ -102,18 +115,18 @@ then
   RETVAL=$?
   if [ ${RETVAL} -ne 0 ]
   then
-    vif --create livemnfsvgw --mac 00:01:5e:00:00
+    vif --create livemnfsvgw --mac 00:00:5e:00:01:00
     ifconfig livemnfsvgw up
   fi
   ## Check if details about livemnfsvgw exists for system restart
-  grep -q "pre-up vif --create livemnfsvgw --mac 00:01:5e:00:00" /etc/network/interfaces
+  grep -q "pre-up vif --create livemnfsvgw --mac 00:00:5e:00:01:00" /etc/network/interfaces
   RETVAL=$?
   if [ ${RETVAL} -ne 0 ]
   then
     echo \"\" >> /etc/network/interfaces
     echo \"auto livemnfsvgw\" >> /etc/network/interfaces
     echo \"iface livemnfsvgw inet manual\" >> /etc/network/interfaces
-    echo \"    pre-up vif --create livemnfsvgw --mac 00:01:5e:00:00\" >> /etc/network/interfaces
+    echo \"    pre-up vif --create livemnfsvgw --mac 00:00:5e:00:01:00\" >> /etc/network/interfaces
     echo \"    pre-up ifconfig livemnfsvgw up\" >> /etc/network/interfaces
   fi
 
@@ -130,44 +143,44 @@ then
   fi
 
   ## Check if route to NFS VM exists ?
-  netstat -nr | grep -q 192.168.101.101
+  netstat -nr | grep -q 192.168.101.3
   RETVAL=$?
   if [ ${RETVAL} -ne 0 ]
   then
-    route add -host 192.168.101.101/32 dev livemnfsvgw
+    route add -host 192.168.101.3/32 dev livemnfsvgw
   fi
   ## Add route to syartup files. as well.
-  grep -q "up route add -host 192.168.101.101/32 dev livemnfsvgw" /etc/network/interfaces
+  grep -q "up route add -host 192.168.101.3/32 dev livemnfsvgw" /etc/network/interfaces
   RETVAL=$?
   if [ ${RETVAL} -ne 0 ]
   then
-    echo "up route add -host 192.168.101.101/32 dev livemnfsvgw" >> /etc/network/interfaces
+    echo "up route add -host 192.168.101.3/32 dev livemnfsvgw" >> /etc/network/interfaces
   fi
 else 
   ## Check routes on compute nodes (non-vm host)
-  netstat -nr | grep -q 192.168.101.101
+  netstat -nr | grep -q 192.168.101.3
   RETVAL=$?
   if [ ${RETVAL} -ne 0 ]
   then
-    route add 192.168.101.101 dev vhost0
+    route add 192.168.101.3 gw ${NOVA_HOST_IP}
   fi
 
   ## Add route to system start-up files
-  grep -q "up route add 192.168.101.101 dev vhost0" /etc/network/interfaces
+  grep -q "up route add 192.168.101.3 gw ${NOVA_HOST_IP}" /etc/network/interfaces
   RETVAL=$?
   if [ ${RETVAL} -ne 0 ]
   then
-    echo "up route add 192.168.101.101 dev vhost0" >> /etc/network/interfaces
+    echo "up route add 192.168.101.3 gw ${NOVA_HOST_IP}" >> /etc/network/interfaces
   fi
 fi
 
 
 ## Ping VM and check if its reachable, if yes, then mount the NFS path
 ## TODO: Exit with error
-ping -c 5 192.168.101.101
+ping -c 5 192.168.101.3
 RETVAL=$?
 if [ $RETVAL -eq 0 ]
 then 
   echo "ping done"
-  mount 192.168.101.101:/livemnfsvol /var/lib/nova/instances/global
+  mount 192.168.101.3:/livemnfsvol /var/lib/nova/instances/global
 fi