openstack
/
masakari
Code Issues Proposed changes

Fix default value of 'nova_catalog_admin_info' 

Devstack deploys nova service with name as 'nova' but in
masakari.conf 'nova_catalog_admin_info' default is
'compute:Compute Service:publicURL' which causes below error
while executing masakari notifications:

EndpointNotFound: publicURL endpoint for compute service named
Compute Service not found.

This patch fixes this issue by changing the default value of config
option 'nova_catalog_admin_info' to 'compute:nova:publicURL'.

NOTE:
In real production deployment of masakari operator has to set the
value of this config option according to the nova service name that
he/she configures.

Closes-Bug: #1746229
Change-Id: I032d85e7e11836a282251885a7f9d4bc76ce7045
This commit is contained in:
dineshbhor 2018-02-21 12:00:16 +09:00
parent 38937a46f1
commit d6483b9282
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 = [
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 '
'service catalog. Format is: separated values of '
'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),
session=p_session.return_value, region_name=None,
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,
extensions=nova.nova_extensions)
@ -78,7 +78,7 @@ class NovaClientTestCase(test.TestCase):
p_api_version(nova.NOVA_API_VERSION),
session=p_session.return_value, region_name=None,
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,
extensions=nova.nova_extensions)
@ -100,7 +100,7 @@ class NovaClientTestCase(test.TestCase):
p_api_version(nova.NOVA_API_VERSION),
session=p_session.return_value, region_name=None,
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,
extensions=nova.nova_extensions)
@ -121,7 +121,7 @@ class NovaClientTestCase(test.TestCase):
p_api_version(nova.NOVA_API_VERSION),
session=p_session.return_value, region_name='farfaraway',
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,
extensions=nova.nova_extensions)