diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-09-27 16:39:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-09-27 16:39:06 +0000 |
| commit | 755cfb885cea36e8463f2dcdb59ff42f5127bae8 (patch) | |
| tree | d86b5419864aaef24d4edc9c70fc328376915ba1 | |
| parent | 8aebceb670132a3495c4e58b55ec1690e7ec5315 (diff) | |
| parent | b61a45c13ffa82356f896f0914d2f28dabea7a7f (diff) | |
| download | heat-755cfb885cea36e8463f2dcdb59ff42f5127bae8.tar.gz | |
Merge "Include credentials for heat calling self"
| -rw-r--r-- | heat/engine/clients/os/heat_plugin.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/heat/engine/clients/os/heat_plugin.py b/heat/engine/clients/os/heat_plugin.py index 9ae6d4320..8726d5c9b 100644 --- a/heat/engine/clients/os/heat_plugin.py +++ b/heat/engine/clients/os/heat_plugin.py @@ -34,6 +34,14 @@ class HeatClientPlugin(client_plugin.ClientPlugin): } endpoint = self.get_heat_url() + if self._get_client_option('heat', 'url'): + # assume that the heat API URL is manually configured because + # it is not in the keystone catalog, so include the credentials + # for the standalone auth_password middleware + args['username'] = self.context.username + args['password'] = self.context.password + del(args['token']) + return hc.Client('1', endpoint, **args) def is_not_found(self, ex): |