diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-12-30 19:41:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-12-30 19:41:33 +0000 |
| commit | 9920dbd49609c0dec1fab69808df7ef57f1cb5cc (patch) | |
| tree | 20d6b804599caee4a4644a3ca8ec3642da938be0 | |
| parent | 6247c949f5253737998405f698654644a364a9b7 (diff) | |
| parent | 3290b24a0d992e258d38e290ba36cbf2f547fa3c (diff) | |
| download | nova-9920dbd49609c0dec1fab69808df7ef57f1cb5cc.tar.gz nova-9920dbd49609c0dec1fab69808df7ef57f1cb5cc.tar.xz nova-9920dbd49609c0dec1fab69808df7ef57f1cb5cc.zip | |
Merge "use dhcp_lease_time for dnsmasq. Fix bug 894218"
| -rwxr-xr-x | nova/network/linux_net.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py index 5ddef5807..3638d5a06 100755 --- a/nova/network/linux_net.py +++ b/nova/network/linux_net.py @@ -51,7 +51,7 @@ flags.DEFINE_string('dhcpbridge', _bin_file('nova-dhcpbridge'), flags.DEFINE_string('routing_source_ip', '$my_ip', 'Public IP of network host') flags.DEFINE_integer('dhcp_lease_time', 120, - 'Lifetime of a DHCP lease') + 'Lifetime of a DHCP lease in seconds') flags.DEFINE_string('dns_server', None, 'if set, uses specific dns server for dnsmasq') flags.DEFINE_string('dmz_cidr', '10.128.0.0/24', @@ -678,7 +678,8 @@ def restart_dhcp(context, dev, network_ref): '--pid-file=%s' % _dhcp_file(dev, 'pid'), '--listen-address=%s' % network_ref['dhcp_server'], '--except-interface=lo', - '--dhcp-range=%s,static,120s' % network_ref['dhcp_start'], + '--dhcp-range=%s,static,%ss' % (network_ref['dhcp_start'], + FLAGS.dhcp_lease_time), '--dhcp-lease-max=%s' % len(netaddr.IPNetwork(network_ref['cidr'])), '--dhcp-hostsfile=%s' % _dhcp_file(dev, 'conf'), '--dhcp-script=%s' % FLAGS.dhcpbridge, |