From 915d00ffff1caaccc1debf8890a1307aa25f55ef Mon Sep 17 00:00:00 2001 From: James Page Date: Thu, 9 Oct 2014 15:15:25 +0100 Subject: [PATCH] Ensure l2population is disabled by default, otherwise upgrades break as driver is not enable in nova-cloud-controller. --- hooks/quantum_contexts.py | 2 +- unit_tests/test_quantum_contexts.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hooks/quantum_contexts.py b/hooks/quantum_contexts.py index cdfb87cc..f62a58d9 100644 --- a/hooks/quantum_contexts.py +++ b/hooks/quantum_contexts.py @@ -106,7 +106,7 @@ def _neutron_api_settings(): defaults if it is not present ''' neutron_settings = { - 'l2_population': True, + 'l2_population': False, 'overlay_network_type': 'gre', } diff --git a/unit_tests/test_quantum_contexts.py b/unit_tests/test_quantum_contexts.py index da3ccdc1..298f6221 100644 --- a/unit_tests/test_quantum_contexts.py +++ b/unit_tests/test_quantum_contexts.py @@ -232,7 +232,7 @@ class TestQuantumGatewayContext(CharmTestCase): 'plugin': 'ovs', 'debug': False, 'verbose': True, - 'l2_population': True, + 'l2_population': False, 'overlay_network_type': 'gre', }) @@ -368,15 +368,15 @@ class TestMisc(CharmTestCase): def test_neutron_api_settings2(self): self.relation_ids.return_value = ['foo'] self.related_units.return_value = ['bar'] - self.test_relation.set({'l2-population': False, + self.test_relation.set({'l2-population': True, 'overlay-network-type': 'gre', }) self.relation_get.side_effect = self.test_relation.get self.assertEquals(quantum_contexts._neutron_api_settings(), - {'l2_population': False, + {'l2_population': True, 'overlay_network_type': 'gre'}) def test_neutron_api_settings_no_apiplugin(self): self.relation_ids.return_value = [] self.assertEquals(quantum_contexts._neutron_api_settings(), - {'l2_population': True, + {'l2_population': False, 'overlay_network_type': 'gre', })