From 1b9de6b874d0afe5c23feb006560b70072f8ac18 Mon Sep 17 00:00:00 2001
From: ChiZhang <z.zhangchi@huawei.com>
Date: Fri, 19 Dec 2014 10:46:15 +0800
Subject: [PATCH] fix  tenant name for  admin client

Change-Id: I8d81193050d7847d288ddc7c936b2cb4616d4c50
---
 cinderproxy/cinder/volume/cinder_proxy.py | 4 ++--
 tricircle                                 | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)
 delete mode 160000 tricircle

diff --git a/cinderproxy/cinder/volume/cinder_proxy.py b/cinderproxy/cinder/volume/cinder_proxy.py
index 9c8a0d6..1b6674d 100644
--- a/cinderproxy/cinder/volume/cinder_proxy.py
+++ b/cinderproxy/cinder/volume/cinder_proxy.py
@@ -267,7 +267,7 @@ class CinderProxy(manager.SchedulerDependentManager):
             cinderclient = cinder_client.Client(
                 username=cfg.CONF.cinder_username,
                 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)
             cinderclient.client.auth_token = client_v2.auth_ref.auth_token
             diction = {'project_id': cfg.CONF.cinder_tenant_id}
@@ -588,8 +588,8 @@ class CinderProxy(manager.SchedulerDependentManager):
                                           {'status': volume._info['status']})
                 LOG.info(_('Cascade info: Updated the volume  %s status from'
                            'cinder-proxy'), volume_id)
-                return
         except cinder_exception.Unauthorized:
+            self.adminCinderClient = self._get_cinder_cascaded_admin_client()
             return
         except Exception:
             with excutils.save_and_reraise_exception():
diff --git a/tricircle b/tricircle
deleted file mode 160000
index 6d4182e..0000000
--- a/tricircle
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6d4182e47ae583fe9329d15b8a8814805ce929c6