From 60c3b3c6b910f8312d912e322e9ff3159958e3aa Mon Sep 17 00:00:00 2001 From: Victor Ryzhenkin Date: Thu, 31 Mar 2016 16:47:48 +0300 Subject: [PATCH] [Murano] Update service_type and auth strategy for murano - Replace application_catalog to application-catalog - Use http_client attribute to get auth_token from muranoclient Change-Id: I64a11b4e1a12cd48109be625bbf4325d1d42686b Closes-Bug: #1558189 --- fuel_health/muranomanager.py | 9 ++++++--- fuel_health/nmanager.py | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/fuel_health/muranomanager.py b/fuel_health/muranomanager.py index 0b88ce08..63660895 100644 --- a/fuel_health/muranomanager.py +++ b/fuel_health/muranomanager.py @@ -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: diff --git a/fuel_health/nmanager.py b/fuel_health/nmanager.py index 5a57ecce..625aa7b2 100644 --- a/fuel_health/nmanager.py +++ b/fuel_health/nmanager.py @@ -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 '