openstack/charm-neutron-gateway
Code Issues Proposed changes

Ensure l2population is disabled by default, otherwise upgrades break as driver is not enable in nova-cloud-controller.

Browse Source
This commit is contained in:
James Page 2014-10-09 15:15:25 +01:00
parent 02cef4dbee
commit 915d00ffff
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/quantum_contexts.py
View File

@ -106,7 +106,7 @@ def _neutron_api_settings():
defaults if it is not present defaults if it is not present
''' '''
neutron_settings = { neutron_settings = {
'l2_population': True, 'l2_population': False,
'overlay_network_type': 'gre', 'overlay_network_type': 'gre',
} }

8
unit_tests/test_quantum_contexts.py
View File

@ -232,7 +232,7 @@ class TestQuantumGatewayContext(CharmTestCase):
'plugin': 'ovs', 'plugin': 'ovs',
'debug': False, 'debug': False,
'verbose': True, 'verbose': True,
'l2_population': True, 'l2_population': False,
'overlay_network_type': 'gre', 'overlay_network_type': 'gre',
}) })
@ -368,15 +368,15 @@ class TestMisc(CharmTestCase):
def test_neutron_api_settings2(self): def test_neutron_api_settings2(self):
self.relation_ids.return_value = ['foo'] self.relation_ids.return_value = ['foo']
self.related_units.return_value = ['bar'] self.related_units.return_value = ['bar']
self.test_relation.set({'l2-population': False, self.test_relation.set({'l2-population': True,
'overlay-network-type': 'gre', }) 'overlay-network-type': 'gre', })
self.relation_get.side_effect = self.test_relation.get self.relation_get.side_effect = self.test_relation.get
self.assertEquals(quantum_contexts._neutron_api_settings(), self.assertEquals(quantum_contexts._neutron_api_settings(),
{'l2_population': False, {'l2_population': True,
'overlay_network_type': 'gre'}) 'overlay_network_type': 'gre'})
def test_neutron_api_settings_no_apiplugin(self): def test_neutron_api_settings_no_apiplugin(self):
self.relation_ids.return_value = [] self.relation_ids.return_value = []
self.assertEquals(quantum_contexts._neutron_api_settings(), self.assertEquals(quantum_contexts._neutron_api_settings(),
{'l2_population': True, {'l2_population': False,
'overlay_network_type': 'gre', }) 'overlay_network_type': 'gre', })