Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replace default glance endpoint type"

Browse Source
This commit is contained in:
Jenkins
2017-06-30 17:21:28 +00:00
committed by Gerrit Code Review
parent a842bc1c91 5eb1d91335
commit 5f179609d0
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
watcher/conf/glance_client.py
View File

@@ -26,10 +26,10 @@ GLANCE_CLIENT_OPTS = [
default='2', default='2',
help='Version of Glance API to use in glanceclient.'), help='Version of Glance API to use in glanceclient.'),
cfg.StrOpt('endpoint_type', cfg.StrOpt('endpoint_type',
default='internalURL', default='publicURL',
help='Type of endpoint to use in glanceclient.' help='Type of endpoint to use in glanceclient.'
'Supported values: internalURL, publicURL, adminURL' 'Supported values: internalURL, publicURL, adminURL'
'The default is internalURL.')] 'The default is publicURL.')]
def register_opts(conf): def register_opts(conf):

5
watcher/tests/common/test_clients.py
View File

@@ -167,11 +167,12 @@ class TestClients(base.TestCase):
@mock.patch.object(clients.OpenStackClients, 'session') @mock.patch.object(clients.OpenStackClients, 'session')
def test_clients_glance_diff_endpoint(self, mock_session): def test_clients_glance_diff_endpoint(self, mock_session):
CONF.set_override('endpoint_type', 'publicURL', group='glance_client') CONF.set_override('endpoint_type',
'internalURL', group='glance_client')
osc = clients.OpenStackClients() osc = clients.OpenStackClients()
osc._glance = None osc._glance = None
osc.glance() osc.glance()
self.assertEqual('publicURL', osc.glance().http_client.interface) self.assertEqual('internalURL', osc.glance().http_client.interface)
@mock.patch.object(clients.OpenStackClients, 'session') @mock.patch.object(clients.OpenStackClients, 'session')
def test_clients_glance_cached(self, mock_session): def test_clients_glance_cached(self, mock_session):