diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-29 23:59:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-29 23:59:31 +0000 |
| commit | 05d16b81bb05788dbbf1c2d2557594a652aeb7f2 (patch) | |
| tree | 36a0d7030b0a38c66373fb54b6e47ffca96af6b6 | |
| parent | 9bea239f71279bd0da39180b28b45935d3203b02 (diff) | |
| parent | cefb87511c4eae22c46f25da7335b4beb4631c4a (diff) | |
| download | nova-05d16b81bb05788dbbf1c2d2557594a652aeb7f2.tar.gz nova-05d16b81bb05788dbbf1c2d2557594a652aeb7f2.tar.xz nova-05d16b81bb05788dbbf1c2d2557594a652aeb7f2.zip | |
Merge "Support external gateways in VLAN mode."
| -rw-r--r-- | nova/network/linux_net.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py index d5c6bb459..7799052fe 100644 --- a/nova/network/linux_net.py +++ b/nova/network/linux_net.py @@ -724,8 +724,10 @@ 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,%ss' % (network_ref['dhcp_start'], - FLAGS.dhcp_lease_time), + '--dhcp-range=set:\'%s\',%s,static,%ss' % + (network_ref['label'], + 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, |