openstack/masakari
Code Issues Proposed changes

Merge "Fix default value of 'nova_catalog_admin_info'"

Browse Source
This commit is contained in:
Zuul 2018-02-21 16:12:31 +00:00 committed by Gerrit Code Review
commit 7b6255af24
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
masakari/conf/nova.py
View File

@ -18,7 +18,7 @@ from oslo_config import cfg
nova_opts = [ nova_opts = [
cfg.StrOpt('nova_catalog_admin_info', cfg.StrOpt('nova_catalog_admin_info',
default='compute:Compute Service:publicURL', default='compute:nova:publicURL',
help='Match this value when searching for nova in the ' help='Match this value when searching for nova in the '
'service catalog. Format is: separated values of ' 'service catalog. Format is: separated values of '
'the form: ' 'the form: '

8
masakari/tests/unit/compute/test_nova.py
View File

@ -58,7 +58,7 @@ class NovaClientTestCase(test.TestCase):
p_api_version(nova.NOVA_API_VERSION), p_api_version(nova.NOVA_API_VERSION),
session=p_session.return_value, region_name=None, session=p_session.return_value, region_name=None,
insecure=False, endpoint_type='publicURL', insecure=False, endpoint_type='publicURL',
service_type='compute', service_name='Compute Service', service_type='compute', service_name='nova',
cacert=None, timeout=None, global_request_id=self.ctx.global_id, cacert=None, timeout=None, global_request_id=self.ctx.global_id,
extensions=nova.nova_extensions) extensions=nova.nova_extensions)
@ -78,7 +78,7 @@ class NovaClientTestCase(test.TestCase):
p_api_version(nova.NOVA_API_VERSION), p_api_version(nova.NOVA_API_VERSION),
session=p_session.return_value, region_name=None, session=p_session.return_value, region_name=None,
insecure=False, endpoint_type='publicURL', insecure=False, endpoint_type='publicURL',
service_type='compute', service_name='Compute Service', service_type='compute', service_name='nova',
cacert=None, timeout=None, global_request_id=self.ctx.global_id, cacert=None, timeout=None, global_request_id=self.ctx.global_id,
extensions=nova.nova_extensions) extensions=nova.nova_extensions)
@ -100,7 +100,7 @@ class NovaClientTestCase(test.TestCase):
p_api_version(nova.NOVA_API_VERSION), p_api_version(nova.NOVA_API_VERSION),
session=p_session.return_value, region_name=None, session=p_session.return_value, region_name=None,
insecure=False, endpoint_type='publicURL', insecure=False, endpoint_type='publicURL',
service_type='compute', service_name='Compute Service', service_type='compute', service_name='nova',
cacert=None, timeout=None, global_request_id=self.ctx.global_id, cacert=None, timeout=None, global_request_id=self.ctx.global_id,
extensions=nova.nova_extensions) extensions=nova.nova_extensions)
@ -121,7 +121,7 @@ class NovaClientTestCase(test.TestCase):
p_api_version(nova.NOVA_API_VERSION), p_api_version(nova.NOVA_API_VERSION),
session=p_session.return_value, region_name='farfaraway', session=p_session.return_value, region_name='farfaraway',
insecure=False, endpoint_type='publicURL', insecure=False, endpoint_type='publicURL',
service_type='compute', service_name='Compute Service', service_type='compute', service_name='nova',
cacert=None, timeout=None, global_request_id=self.ctx.global_id, cacert=None, timeout=None, global_request_id=self.ctx.global_id,
extensions=nova.nova_extensions) extensions=nova.nova_extensions)