diff options
| author | Stuart McLaren <stuart.mclaren@hp.com> | 2014-10-28 15:49:48 +0000 |
|---|---|---|
| committer | Stuart McLaren <stuart.mclaren@hp.com> | 2014-10-28 16:27:40 +0000 |
| commit | e284f8c080c87acdc2757e0fe16063214c2988be (patch) | |
| tree | d0a264b8201c44ba594b6fb2633d6961570ac36c | |
| parent | 3bb94dcad84ed4204d8809fcf95b7713daa2189b (diff) | |
| download | glance_store-e284f8c080c87acdc2757e0fe16063214c2988be.tar.gz | |
Move cinder store to use auth_token
The cinder store uses auth_tok. This should be
changed to use auth_token as the glance request
context is changing: https://review.openstack.org/#/c/131478/
Change-Id: Id8a920d7035de111ce3fde54d62f35a07a9a7851
Partial-bug: #1385213
| -rw-r--r-- | glance_store/_drivers/cinder.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/glance_store/_drivers/cinder.py b/glance_store/_drivers/cinder.py index a50e548..a2b4a15 100644 --- a/glance_store/_drivers/cinder.py +++ b/glance_store/_drivers/cinder.py @@ -86,7 +86,7 @@ def get_cinderclient(conf, context): glance_store = conf.glance_store c = cinderclient.Client(context.user, - context.auth_tok, + context.auth_token, project_id=context.tenant, auth_url=url, insecure=glance_store.cinder_api_insecure, @@ -94,8 +94,8 @@ def get_cinderclient(conf, context): cacert=glance_store.cinder_ca_certificates_file) # noauth extracts user_id:project_id from auth_token - c.client.auth_token = context.auth_tok or '%s:%s' % (context.user, - context.tenant) + c.client.auth_token = context.auth_token or '%s:%s' % (context.user, + context.tenant) c.client.management_url = url return c |