From 4d7ab61187c3d6cdf2682df1eeabe9d96121a5e2 Mon Sep 17 00:00:00 2001 From: Rabi Mishra Date: Sat, 30 Jul 2016 08:04:45 +0530 Subject: [PATCH] Change usage of _auth_url private attribute python-openstackclient-2.6.1 has been changed to use osc-lib ClientManager which removes some private attributes. We can change '_interface' and '_region_name' once the requirements change to 2.6.1. Change-Id: I17fbe2250fdeb60ffb9b2f94df26d9edef00bea6 Closes-Bug: #1605876 --- heatclient/osc/plugin.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/heatclient/osc/plugin.py b/heatclient/osc/plugin.py index fe2a18df..32c0e15f 100644 --- a/heatclient/osc/plugin.py +++ b/heatclient/osc/plugin.py @@ -33,6 +33,8 @@ def make_client(instance): API_VERSIONS) LOG.debug('Instantiating orchestration client: %s', heat_client) + # Note: We can change '_interface' and '_region_name' once + # the requirements change to python-openstackclient-2.6.1 endpoint = instance.get_endpoint_for_service_type( API_NAME, region_name=instance._region_name, @@ -40,7 +42,7 @@ def make_client(instance): ) kwargs = {'endpoint': endpoint, - 'auth_url': instance._auth_url, + 'auth_url': instance.auth.auth_url, 'region_name': instance._region_name, 'username': instance.auth_ref.username}