diff options
| author | Soren Hansen <soren.hansen@rackspace.com> | 2010-11-03 19:44:09 +0000 |
|---|---|---|
| committer | Tarmac <> | 2010-11-03 19:44:09 +0000 |
| commit | fb53f764a82dd8e6d1992c4c254e90c185fd9c53 (patch) | |
| tree | 6a9e37cf3e0c5114d9a212fc0227f3959dcab86d | |
| parent | 5983b0305f919ec1f99859f107c05ed812d6a641 (diff) | |
| parent | 2a16ae2f8479e469e413dfd036bac805163f3ac2 (diff) | |
| download | nova-fb53f764a82dd8e6d1992c4c254e90c185fd9c53.tar.gz nova-fb53f764a82dd8e6d1992c4c254e90c185fd9c53.tar.xz nova-fb53f764a82dd8e6d1992c4c254e90c185fd9c53.zip | |
Change socket type in nova.utils.get_my_ip() to SOCK_DGRAM. This way, we don't actually have to set up a connection.
Also, change the destination host to an IP (chose one of Google's DNS's at random) rather than a hostname, so we avoid doing a DNS lookup.
| -rw-r--r-- | nova/utils.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/utils.py b/nova/utils.py index bc495a691..e7892a212 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -154,8 +154,8 @@ def get_my_ip(): if getattr(FLAGS, 'fake_tests', None): return '127.0.0.1' try: - csock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - csock.connect(('www.google.com', 80)) + csock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + csock.connect(('8.8.8.8', 80)) (addr, port) = csock.getsockname() csock.close() return addr |