diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-30 13:21:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-30 13:21:42 +0000 |
| commit | c4ce2bb7fd55a4cc725c14a7343d3ab01c481277 (patch) | |
| tree | 7fd235e75e637c9099e716f63f0f2778f057a374 /kolla | |
| parent | d6adabf73bc757ec352e42527feb156ae4c87015 (diff) | |
| parent | 7b97cd07c1391f86eb97f7cf4880849ad3a047e3 (diff) | |
| download | kolla-c4ce2bb7fd55a4cc725c14a7343d3ab01c481277.tar.gz kolla-c4ce2bb7fd55a4cc725c14a7343d3ab01c481277.zip | |
Merge "Add neutron vpnaas code into neutron-server container"
Diffstat (limited to 'kolla')
| -rw-r--r-- | kolla/common/config.py | 4 | ||||
| -rw-r--r-- | kolla/tests/test_build.py | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index cbdc31b06..467781468 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -270,6 +270,10 @@ SOURCES = { 'type': 'url', 'location': ('http://tarballs.openstack.org/networking-sfc/' 'networking-sfc-master.tar.gz')}, + 'neutron-server-plugin-vpnaas-agent': { + 'type': 'url', + 'location': ('http://tarballs.openstack.org/neutron-vpnaas/' + 'neutron-vpnaas-master.tar.gz')}, 'neutron-vpnaas-agent': { 'type': 'url', 'location': ('http://tarballs.openstack.org/neutron-vpnaas/' diff --git a/kolla/tests/test_build.py b/kolla/tests/test_build.py index 62e107972..fccf7f41b 100644 --- a/kolla/tests/test_build.py +++ b/kolla/tests/test_build.py @@ -189,11 +189,16 @@ class KollaWorkerTest(base.TestCase): 'source': 'https://git.openstack.org/openstack/networking-arista', 'type': 'git' } + + found = False for image in kolla.images: if image.name == 'neutron-server': - self.assertEqual(image.plugins[0], expected_plugin) + for plugin in image.plugins: + if plugin == expected_plugin: + found = True + break break - else: + if not found: self.fail('Can not find the expected neutron arista plugin') def test_build_image_list_plugin_parsing(self): |