diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-24 01:07:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-24 01:07:34 +0000 |
| commit | 49d000c2958bcd6887bdaad643d6913a02462091 (patch) | |
| tree | 887961bf5d86c296b12e356a27c22750b04db94f | |
| parent | 7733aa3635ed662d782bdacbd646439d28ea87a3 (diff) | |
| parent | 9e28993ee6fb814f014bc73a5611681ca3bb2c65 (diff) | |
| download | python-heatclient-49d000c2958bcd6887bdaad643d6913a02462091.tar.gz | |
Merge "Make sure the --heat-url option is respected"
| -rw-r--r-- | heatclient/common/http.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/heatclient/common/http.py b/heatclient/common/http.py index 3326795..3924010 100644 --- a/heatclient/common/http.py +++ b/heatclient/common/http.py @@ -337,6 +337,11 @@ class SessionClient(HTTPClient): # just return the redirect response. Useful for using stacks:lookup. follow_redirects = kwargs.pop('follow_redirects', True) + # If the endpoint is passed in, make sure keystone uses it + # instead of looking up the endpoint in the auth plugin. + if self.endpoint: + kwargs['endpoint_override'] = self.endpoint + resp = self.session.request(url, method, redirect=follow_redirects, raise_exc=False, **kwargs) |