diff options
| author |   Mark Beierl <mark.beierl@emc.com> | 2016-03-09 14:55:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-03-09 14:55:49 +0000 |
| commit | 56bee3e9541961e5d542d2c008b5420ff44bd185 (patch) | |
| tree | 6022da5f8244869de31e717f5dd2c7030525a2f2 | |
| parent | 588c94351caa067f25417af1f186d10c4904d7fe (diff) | |
| parent | 5cedf955f643e3904182c6b0807912092f46e971 (diff) | |
Merge "Cinder fix"
| -rw-r--r-- | docker/requirements.pip | 2 | ||||
| -rw-r--r-- | storperf/storperf_master.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/docker/requirements.pip b/docker/requirements.pip index be29c28..c6f262c 100644 --- a/docker/requirements.pip +++ b/docker/requirements.pip @@ -3,7 +3,7 @@ python-neutronclient==2.6.0 python-heatclient==0.8.0 python-novaclient==2.28.1 python-glanceclient==1.1.0 -python-cinderclient==1.4.0 +python-cinderclient==1.6.0 python-keystoneclient==1.6.0 flask>=0.10 flask-restful>=0.3.5 diff --git a/storperf/storperf_master.py b/storperf/storperf_master.py index 9e88a3c..c5d436e 100644 --- a/storperf/storperf_master.py +++ b/storperf/storperf_master.py @@ -45,6 +45,7 @@ class StorPerfMaster(object): self._username = os.environ.get('OS_USERNAME') self._password = os.environ.get('OS_PASSWORD') self._tenant_name = os.environ.get('OS_TENANT_NAME') + self._tenant_id = os.environ.get('OS_TENANT_ID') self._project_name = os.environ.get('OS_PROJECT_NAME') self._auth_url = os.environ.get('OS_AUTH_URL') @@ -128,7 +129,7 @@ class StorPerfMaster(object): @property def volume_quota(self): self._attach_to_openstack() - quotas = self._cinder_client.quotas.get(self._tenant_name) + quotas = self._cinder_client.quotas.get(self._tenant_id) return int(quotas.volumes) @property |