From c22cc1f97286fb442d31318f97b4baec6f032e49 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Wed, 14 Oct 2015 09:32:05 -0400 Subject: [PATCH] Remove shared=False from get_internal_network It turns out internal networks can be shared (as in BlueBox) Removing the shared=False from the internal network search produces correct results. Change-Id: I40ba45d8fc78a0d10a44503ed5b7daf91924e441 --- shade/__init__.py | 1 - shade/tests/unit/test_meta.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/shade/__init__.py b/shade/__init__.py index 0e5acee6d..4dcc28cf8 100644 --- a/shade/__init__.py +++ b/shade/__init__.py @@ -1143,7 +1143,6 @@ class OpenStackCloud(object): self._internal_network_stamp, filters={ 'router:external': False, - 'shared': False }) self._internal_network_stamp = True return self._internal_networks diff --git a/shade/tests/unit/test_meta.py b/shade/tests/unit/test_meta.py index a8adbb992..fabaecccc 100644 --- a/shade/tests/unit/test_meta.py +++ b/shade/tests/unit/test_meta.py @@ -146,7 +146,7 @@ class TestMeta(testtools.TestCase): self.assertEqual(PRIVATE_V4, meta.get_server_private_ip(srv, cloud)) mock_has_service.assert_called_with('network') mock_search_networks.assert_called_with( - filters={'router:external': False, 'shared': False} + filters={'router:external': False} ) @mock.patch.object(shade.OpenStackCloud, 'get_image_name') @@ -189,7 +189,7 @@ class TestMeta(testtools.TestCase): self.assertEqual(PRIVATE_V4, srv['private_v4']) mock_has_service.assert_called_with('volume') mock_search_networks.assert_called_with( - filters={'router:external': False, 'shared': False} + filters={'router:external': False} ) @mock.patch.object(shade.OpenStackCloud, 'has_service')