diff options
| author | Joel Moore joelbm24@gmail.com <> | 2010-08-14 22:42:49 +0000 |
|---|---|---|
| committer | Tarmac <> | 2010-08-14 22:42:49 +0000 |
| commit | 2dc2c9dc71bb50a5e322c8fdc5af3f831d41ddba (patch) | |
| tree | 63d85242432e5d07ecb51b285b6f9f88142f861e | |
| parent | 25f97fbe3acd4765965e402ae4ed72a041610447 (diff) | |
| parent | 8d70245cc78075356ec1ebabc4810df8b07428f6 (diff) | |
| download | nova-2dc2c9dc71bb50a5e322c8fdc5af3f831d41ddba.tar.gz nova-2dc2c9dc71bb50a5e322c8fdc5af3f831d41ddba.tar.xz nova-2dc2c9dc71bb50a5e322c8fdc5af3f831d41ddba.zip | |
Removes requirement of internet connectivity to run api server.
| -rw-r--r-- | nova/utils.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/nova/utils.py b/nova/utils.py index 0b23de7cd..63db080f1 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -119,11 +119,15 @@ def get_my_ip(): ''' if getattr(FLAGS, 'fake_tests', None): return '127.0.0.1' - csock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - csock.connect(('www.google.com', 80)) - (addr, port) = csock.getsockname() - csock.close() - return addr + try: + csock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + csock.connect(('www.google.com', 80)) + (addr, port) = csock.getsockname() + csock.close() + return addr + except socket.gaierror as ex: + logging.warn("Couldn't get IP, using 127.0.0.1 %s", ex) + return "127.0.0.1" def isotime(at=None): if not at: |