fix bad remove sec_group disable

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

View File

@ -47,6 +47,10 @@ def _neutron_api_settings():
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')
if net_dev_mtu:
neutron_settings['network_device_mtu'] = net_dev_mtu

View File

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