From 7b766680b0c9c47539c74b4aa92d796d094dfcbd Mon Sep 17 00:00:00 2001 From: Hidekazu Nakamura Date: Wed, 31 May 2017 14:59:04 +0900 Subject: [PATCH] Replace default cinder endpoint type The default cinder endpoint type is publicURL in cinderclient. This patch replaces default cinder endpoint type from internalURL to publicURL. Change-Id: Ie6951086e4656bd83195dab151dbaaf948113a7c Related-Bug: #1686298 --- watcher/conf/cinder_client.py | 4 ++-- watcher/tests/common/test_clients.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/watcher/conf/cinder_client.py b/watcher/conf/cinder_client.py index ddd86b4f0..687c4ce6c 100644 --- a/watcher/conf/cinder_client.py +++ b/watcher/conf/cinder_client.py @@ -26,10 +26,10 @@ CINDER_CLIENT_OPTS = [ default='3', help='Version of Cinder API to use in cinderclient.'), cfg.StrOpt('endpoint_type', - default='internalURL', + default='publicURL', help='Type of endpoint to use in cinderclient.' 'Supported values: internalURL, publicURL, adminURL' - 'The default is internalURL.')] + 'The default is publicURL.')] def register_opts(conf): diff --git a/watcher/tests/common/test_clients.py b/watcher/tests/common/test_clients.py index 813eec712..1349779dc 100755 --- a/watcher/tests/common/test_clients.py +++ b/watcher/tests/common/test_clients.py @@ -239,11 +239,12 @@ class TestClients(base.TestCase): @mock.patch.object(clients.OpenStackClients, 'session') def test_clients_cinder_diff_endpoint(self, mock_session): - CONF.set_override('endpoint_type', 'publicURL', group='cinder_client') + CONF.set_override('endpoint_type', + 'internalURL', group='cinder_client') osc = clients.OpenStackClients() osc._cinder = None osc.cinder() - self.assertEqual('publicURL', osc.cinder().client.interface) + self.assertEqual('internalURL', osc.cinder().client.interface) @mock.patch.object(clients.OpenStackClients, 'session') def test_clients_cinder_cached(self, mock_session):