Browse code

Merge pull request #172 from cloudbuilders/eth0_ip

Use eth0 to determine host ip address

sleepsonthefloor authored on 2011/11/16 03:47:40
Showing 1 changed files
... ...
@@ -172,9 +172,16 @@ LIBVIRT_TYPE=${LIBVIRT_TYPE:-kvm}
172 172
 # cases unless you are working on multi-zone mode.
173 173
 SCHEDULER=${SCHEDULER:-nova.scheduler.simple.SimpleScheduler}
174 174
 
175
-# Use the first IP unless an explicit is set by ``HOST_IP`` environment variable
175
+# Use the eth0 IP unless an explicit is set by ``HOST_IP`` environment variable
176 176
 if [ ! -n "$HOST_IP" ]; then
177
-    HOST_IP=`LC_ALL=C /sbin/ifconfig  | grep -m 1 'inet addr:'| cut -d: -f2 | awk '{print $1}'`
177
+    HOST_IP=`LC_ALL=C /sbin/ifconfig eth0 | grep -m 1 'inet addr:'| cut -d: -f2 | awk '{print $1}'`
178
+    if [ "$HOST_IP" = "" ]; then
179
+        echo "Could not determine host ip address."
180
+        echo "If this is not your first run of stack.sh, it is "
181
+        echo "possible that nova moved your eth0 ip address to the FLAT_NETWORK_BRIDGE."
182
+        echo "Please specify your HOST_IP in your localrc."
183
+        exit 1
184
+    fi
178 185
 fi
179 186
 
180 187
 # Service startup timeout