diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-13 21:02:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-13 21:02:02 +0000 |
| commit | 0e971ef9e990e48f81271d81c7e46b08f538abbd (patch) | |
| tree | f3d06c6a9cc405892c4f15632607461279aaec7f | |
| parent | de10c0d7d26ff5ed012f4a4a1b9f0ae9000dfe71 (diff) | |
| parent | e41f586d0701e4b2d3e7ad8de4a05e8be216e096 (diff) | |
| download | nova-0e971ef9e990e48f81271d81c7e46b08f538abbd.tar.gz nova-0e971ef9e990e48f81271d81c7e46b08f538abbd.tar.xz nova-0e971ef9e990e48f81271d81c7e46b08f538abbd.zip | |
Merge "Remove date_dhcp_on_disassociate comment and docs."
| -rw-r--r-- | etc/nova/nova.conf.sample | 2 | ||||
| -rw-r--r-- | nova/network/manager.py | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample index c413fcee8..1ff6ec357 100644 --- a/etc/nova/nova.conf.sample +++ b/etc/nova/nova.conf.sample @@ -622,8 +622,6 @@ # network_size=256 ###### (IntOpt) Number of networks to support # num_networks=1 -###### (BoolOpt) Whether to update dhcp when fixed_ip is disassociated -# update_dhcp_on_disassociate=false ###### (StrOpt) vlans will bridge into this interface if set # vlan_interface=<None> ###### (IntOpt) First VLAN for private networks diff --git a/nova/network/manager.py b/nova/network/manager.py index e7bc0c8a8..160bae1ef 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -36,8 +36,6 @@ topologies. All of the network commands are issued to a subclass of :network_size: Number of addresses in each private subnet :floating_range: Floating IP address block :fixed_range: Fixed IP address block -:date_dhcp_on_disassociate: Whether to update dhcp when fixed_ip - is disassociated :fixed_ip_disassociate_timeout: Seconds after which a deallocated ip is disassociated :create_unique_mac_address_attempts: Number of times to attempt creating |