From 0d3bba2438a20cc5ffd7627bbf0e3b9194e856fc Mon Sep 17 00:00:00 2001
From: Ryan Lane <rlane@wikimedia.org>
Date: Tue, 8 Feb 2011 01:00:00 +0000
Subject: [PATCH] Catching all socket errors in _get_my_ip, since any socket
 error is likely enough to cause a failure in detection.

---
 nova/flags.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/flags.py b/nova/flags.py
index 43bc174d..1d8eba94 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -208,7 +208,7 @@ def _get_my_ip():
         (addr, port) = csock.getsockname()
         csock.close()
         return addr
-    except socket.gaierror as ex:
+    except socket.error as ex:
         return "127.0.0.1"