fix tenant name for admin client
Change-Id: I8d81193050d7847d288ddc7c936b2cb4616d4c50
This commit is contained in:
parent
82e81414b3
commit
1b9de6b874
|
@ -267,7 +267,7 @@ class CinderProxy(manager.SchedulerDependentManager):
|
||||||
cinderclient = cinder_client.Client(
|
cinderclient = cinder_client.Client(
|
||||||
username=cfg.CONF.cinder_username,
|
username=cfg.CONF.cinder_username,
|
||||||
api_key=cfg.CONF.cinder_password,
|
api_key=cfg.CONF.cinder_password,
|
||||||
tenant_id=cfg.CONF.cinder_tenant_name,
|
tenant_name=cfg.CONF.cinder_tenant_name,
|
||||||
auth_url=cfg.CONF.keystone_auth_url)
|
auth_url=cfg.CONF.keystone_auth_url)
|
||||||
cinderclient.client.auth_token = client_v2.auth_ref.auth_token
|
cinderclient.client.auth_token = client_v2.auth_ref.auth_token
|
||||||
diction = {'project_id': cfg.CONF.cinder_tenant_id}
|
diction = {'project_id': cfg.CONF.cinder_tenant_id}
|
||||||
|
@ -588,8 +588,8 @@ class CinderProxy(manager.SchedulerDependentManager):
|
||||||
{'status': volume._info['status']})
|
{'status': volume._info['status']})
|
||||||
LOG.info(_('Cascade info: Updated the volume %s status from'
|
LOG.info(_('Cascade info: Updated the volume %s status from'
|
||||||
'cinder-proxy'), volume_id)
|
'cinder-proxy'), volume_id)
|
||||||
return
|
|
||||||
except cinder_exception.Unauthorized:
|
except cinder_exception.Unauthorized:
|
||||||
|
self.adminCinderClient = self._get_cinder_cascaded_admin_client()
|
||||||
return
|
return
|
||||||
except Exception:
|
except Exception:
|
||||||
with excutils.save_and_reraise_exception():
|
with excutils.save_and_reraise_exception():
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit 6d4182e47ae583fe9329d15b8a8814805ce929c6
|
|
Loading…
Reference in New Issue