Merge lp:~rackspace-titan/nova/dhcpbridge_fix_hostname into lp:~hudson-openstack/nova/trunk

[Dan Prince]

Nuke hostname from nova-dhcpbridge. We don't use it.

[Vish Ishaya (vishvananda)]

I'm a bit confused about this one. We set hostname in _host_lease and _host_dhcp in linux_net. It looks like hostname is getting set from display_name. So perhaps display_name is being set to an empty string sometimes and causing this error? That is the only way that i can see this issue suddenly cropping up.

review: Needs Fixing

[Vish Ishaya (vishvananda)]

if the above is the issue, perhaps:

display_name = instance['display_name']
if display_name is None:
    return 'server_%d' % (instance['id'],)

should be:

if not display_name

?

[Dan Prince (dan-prince)]

Hmmm. I guess what I'm trying to understand is how nova-dhcpbridge actually made use of the hostname arg. Ultimately it doesn't seem to go anywhere.

[Vish Ishaya (vishvananda)]

Good point. I guess the only place it shows up is in logging, so we can kill it. That said, I think it is an issue if hostname is not set, so it would be good to track down why that is happening.

review: Approve

[Brian Waldon (bcwaldon)]

Looks good to me, Dan.

review: Approve

=== modified file 'bin/nova-dhcpbridge'
--- bin/nova-dhcpbridge	2011-07-18 23:58:23 +0000
+++ bin/nova-dhcpbridge	2011-08-04 20:26:05 +0000
@@ -53,7 +53,7 @@
 LOG = logging.getLogger('nova.dhcpbridge')
 
 
-def add_lease(mac, ip_address, _hostname, _interface):
+def add_lease(mac, ip_address, _interface):
     """Set the IP that was assigned by the DHCP server."""
     if FLAGS.fake_rabbit:
         LOG.debug(_("leasing ip"))
@@ -67,13 +67,13 @@
                   "args": {"address": ip_address}})
 
 
-def old_lease(mac, ip_address, hostname, interface):
+def old_lease(mac, ip_address, interface):
     """Update just as add lease."""
-    LOG.debug(_("Adopted old lease or got a change of mac/hostname"))
-    add_lease(mac, ip_address, hostname, interface)
-
-
-def del_lease(mac, ip_address, _hostname, _interface):
+    LOG.debug(_("Adopted old lease or got a change of mac"))
+    add_lease(mac, ip_address, interface)
+
+
+def del_lease(mac, ip_address, _interface):
     """Called when a lease expires."""
     if FLAGS.fake_rabbit:
         LOG.debug(_("releasing ip"))
@@ -115,11 +115,10 @@
     if action in ['add', 'del', 'old']:
         mac = argv[2]
         ip = argv[3]
-        hostname = argv[4]
-        msg = _("Called %(action)s for mac %(mac)s with ip %(ip)s and"
-                " hostname %(hostname)s on interface %(interface)s") % locals()
+        msg = _("Called %(action)s for mac %(mac)s with ip %(ip)s"
+                " on interface %(interface)s") % locals()
         LOG.debug(msg)
-        globals()[action + '_lease'](mac, ip, hostname, interface)
+        globals()[action + '_lease'](mac, ip, interface)
     else:
         print init_leases(interface)