summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Prince <dan.prince@rackspace.com>2011-08-04 16:02:28 -0400
committerDan Prince <dan.prince@rackspace.com>2011-08-04 16:02:28 -0400
commit346454c7fb1156d8dff075042f1c45dbb22cded1 (patch)
treea55290b51c115496fe4f2c6448e4b7f2093c9229
parentb97140981a30571750ca135330fe0efaaa5f50cf (diff)
downloadnova-346454c7fb1156d8dff075042f1c45dbb22cded1.tar.gz
nova-346454c7fb1156d8dff075042f1c45dbb22cded1.tar.xz
nova-346454c7fb1156d8dff075042f1c45dbb22cded1.zip
Nuke hostname. We don't use it.
-rwxr-xr-xbin/nova-dhcpbridge17
1 files changed, 8 insertions, 9 deletions
diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge
index 325642d52..621222d8f 100755
--- a/bin/nova-dhcpbridge
+++ b/bin/nova-dhcpbridge
@@ -53,7 +53,7 @@ flags.DEFINE_string('dnsmasq_interface', 'br0', 'Default Dnsmasq interface')
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 @@ def add_lease(mac, ip_address, _hostname, _interface):
"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)
+ LOG.debug(_("Adopted old lease or got a change of mac"))
+ add_lease(mac, ip_address, interface)
-def del_lease(mac, ip_address, _hostname, _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 @@ def main():
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)