summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-28 05:21:47 +0000
committerGerrit Code Review <review@openstack.org>2019-01-28 05:21:47 +0000
commitf3b6666d214f70cac4f93cac37e2ed96b82a6044 (patch)
treee80a5c776b649cff915c2d9dc14ed781465a1cf0
parentcb52c16a27d8e1ef65c02c273ef348a049aec6c4 (diff)
parente329e24cfe8748847907834c384b2496638c5a77 (diff)
downloadheat-f3b6666d214f70cac4f93cac37e2ed96b82a6044.tar.gz
Merge "Fix for None base_url for Monasca client" into stable/pike9.0.6
-rw-r--r--heat/engine/clients/os/monasca.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/heat/engine/clients/os/monasca.py b/heat/engine/clients/os/monasca.py
index d8b5dd6aa..d95b91069 100644
--- a/heat/engine/clients/os/monasca.py
+++ b/heat/engine/clients/os/monasca.py
@@ -14,6 +14,7 @@
from monascaclient import client
from monascaclient import exc as monasca_exc
+from heat.common import endpoint_utils
from heat.common import exception as heat_exc
from heat.engine.clients import client_plugin
from heat.engine import constraints
@@ -37,6 +38,9 @@ class MonascaClientPlugin(client_plugin.ClientPlugin):
self.VERSION,
token=self.context.keystone_session.get_token(),
endpoint=endpoint,
+ auth_url=endpoint_utils.get_auth_uri(),
+ project_name=self.context.project_name,
+ project_domain_id=self.context.project_domain,
cacert=self._get_client_option(CLIENT_NAME, 'ca_file'),
cert_file=self._get_client_option(CLIENT_NAME, 'cert_file'),
key_file=self._get_client_option(CLIENT_NAME, 'key_file'),