openstack
/
fuel-ostf
Code Issues Proposed changes

Merge "[Murano] Update service_type and auth strategy for murano" into stable/mitaka

This commit is contained in:
Jenkins 2016-05-05 10:58:33 +00:00 committed by Gerrit Code Review
parent d1196afc14 5ddbe9ee6b
commit bbd61f004d
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fuel_health/muranomanager.py
View File

@ -57,11 +57,14 @@ class MuranoTest(fuel_health.nmanager.PlatformServicesBaseClass):
self.murano_available = True
self.endpoint = '{0}/v1/'.format(
self.identity_client.service_catalog.url_for(
service_type='application_catalog',
service_type='application-catalog',
endpoint_type='publicURL'))
self.headers = {'X-Auth-Token': self.murano_client.auth_token,
'content-type': 'application/json'}
self.headers = {
'X-Auth-Token': self.murano_client.http_client.auth_token,
'content-type': 'application/json'
}
try:
self.list_environments()
except exceptions.CommunicationError:

2
fuel_health/nmanager.py
View File

@ -273,7 +273,7 @@ class OfficialClientManager(fuel_health.manager.Manager):
try:
endpoint = keystone.service_catalog.url_for(
service_type='application_catalog',
service_type='application-catalog',
endpoint_type='publicURL')
except keystoneclient.exceptions.EndpointNotFound:
LOG.warning('Endpoint for Murano service '