openstack/nova
Code Issues Proposed changes

Merge "Change force_dhcp_release default to True"

Browse Source
This commit is contained in:
Jenkins 2013-07-24 20:35:44 +00:00 committed by Gerrit Code Review
commit 915aaee65a
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/nova/nova.conf.sample
View File

@ -1198,7 +1198,7 @@
# If True, send a dhcp release on instance termination # If True, send a dhcp release on instance termination
# (boolean value) # (boolean value)
#force_dhcp_release=false #force_dhcp_release=true
# If True in multi_host mode, all compute hosts share the same # If True in multi_host mode, all compute hosts share the same
# dhcp address. (boolean value) # dhcp address. (boolean value)

2
nova/network/manager.py
View File

@ -148,7 +148,7 @@ network_opts = [
'deleted in VLAN network mode with multi hosted ' 'deleted in VLAN network mode with multi hosted '
'networks'), 'networks'),
cfg.BoolOpt('force_dhcp_release', cfg.BoolOpt('force_dhcp_release',
default=False, default=True,
help='If True, send a dhcp release on instance termination'), help='If True, send a dhcp release on instance termination'),
cfg.BoolOpt('share_dhcp_address', cfg.BoolOpt('share_dhcp_address',
default=False, default=False,

1
nova/test.py
View File

@ -250,6 +250,7 @@ class TestCase(testtools.TestCase):
self.policy = self.useFixture(policy_fixture.PolicyFixture()) self.policy = self.useFixture(policy_fixture.PolicyFixture())
CONF.set_override('fatal_exception_format_errors', True) CONF.set_override('fatal_exception_format_errors', True)
CONF.set_override('enabled', True, 'osapi_v3') CONF.set_override('enabled', True, 'osapi_v3')
CONF.set_override('force_dhcp_release', False)
def _restore_obj_registry(self): def _restore_obj_registry(self):
objects_base.NovaObject._obj_classes = self._base_test_obj_backup objects_base.NovaObject._obj_classes = self._base_test_obj_backup