openstack/charm-neutron-openvswitch
Code Issues Proposed changes

fix bad remove sec_group disable

Browse Source
This commit is contained in:
Edward Hope-Morley 2015-03-18 18:23:06 +01:00
parent a1227fc40f
commit dfaded5874
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hooks/neutron_ovs_context.py
View File

@ -47,6 +47,10 @@ def _neutron_api_settings():
bool_from_string(rdata['neutron-security-groups']) bool_from_string(rdata['neutron-security-groups'])
}) })
# Override with configuration if set to true
if config('disable-security-groups'):
neutron_settings['neutron_security_groups'] = False
net_dev_mtu = rdata.get('network-device-mtu') net_dev_mtu = rdata.get('network-device-mtu')
if net_dev_mtu: if net_dev_mtu:
neutron_settings['network_device_mtu'] = net_dev_mtu neutron_settings['network_device_mtu'] = net_dev_mtu

2
unit_tests/test_neutron_ovs_context.py
View File

@ -167,7 +167,7 @@ class OVSPluginContextTest(CharmTestCase):
napi_ctxt = context.OVSPluginContext() napi_ctxt = context.OVSPluginContext()
expect = { expect = {
'neutron_alchemy_flags': {}, 'neutron_alchemy_flags': {},
'neutron_security_groups': True, 'neutron_security_groups': False,
'verbose': True, 'verbose': True,
'local_ip': '127.0.0.15', 'local_ip': '127.0.0.15',
'veth_mtu': 1500, 'veth_mtu': 1500,