openstack
/
glance_store
Code Issues Proposed changes

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
This commit is contained in:
Stuart McLaren 2014-10-28 15:49:48 +00:00
parent 3bb94dcad8
commit e284f8c080
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glance_store/_drivers/cinder.py
View File

@ -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