Merge lp:~soren/nova/lp668229 into lp:~hudson-openstack/nova/trunk

[Soren Hansen]

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.

[Dave Walker (davewalker)]

Works for me... testing in a closed environment, and one with misleading /etc/hosts (which caused issue with another approach). Not tried against a skewed routing table, but that seems an unfair experiment.

[Thierry Carrez (ttx)]

Hmm, except that 8.8.8.8 (being a DNS server) doesn't answer on port 80 ?

[Dave Walker (davewalker)]

@ttx, The switch to UDP means no connection is actually made, as no datagrams are sent. So the port is only required for generating the essentially unused socket, for gathering information from the OS.

[Devin Carlen (devcamcar)]

approve, this has bitten me before :)

review: Approve

[Vish Ishaya (vishvananda)]

lgtm

review: Approve

=== modified file 'nova/utils.py'
--- nova/utils.py	2010-10-26 22:37:32 +0000
+++ nova/utils.py	2010-11-03 14:08:07 +0000
@@ -154,8 +154,8 @@
     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