From e41f586d0701e4b2d3e7ad8de4a05e8be216e096 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Tue, 13 Mar 2012 13:31:40 -0400 Subject: Remove date_dhcp_on_disassociate comment and docs. Remove date_dhcp_on_disassociate comments/docs. This option no longer exists. Change-Id: Ia1462abf6166a4a7c53fba7fe231dc13a542480d --- etc/nova/nova.conf.sample | 2 -- nova/network/manager.py | 2 -- 2 files changed, 4 deletions(-) diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample index 54caf29ed..d09835997 100644 --- a/etc/nova/nova.conf.sample +++ b/etc/nova/nova.conf.sample @@ -579,8 +579,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= ###### (IntOpt) First VLAN for private networks diff --git a/nova/network/manager.py b/nova/network/manager.py index e80396bdd..90ae73db5 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 -- cgit