commit 7c9115ddf1aa38585746536c85069eebb4339d85
author Steve Baker <sbaker@redhat.com> Mon Aug 03 11:12:46 2015 +1200
committer Steve Baker <sbaker@redhat.com> Mon Aug 03 11:12:46 2015 +1200
tree 39b2fec3e28675688dd558aec9772775a2957721
parent 4c9f2dd4c79b3d05ccc39136d1d498ead7b4355e

Integration test check for OS_PROJECT_NAME too

Devstack credential files no longer set OS_TENANT_NAME, so running
tests with locally sourced credentials was failing

Change-Id: I7191f36c3a5f6587ebaed7e1b6fd211bd01f54d4

common/config.py

diff --git a/common/config.py b/common/config.py
index 0de6480..75f1dbf 100644
--- a/common/config.py
+++ b/common/config.py
@@ -27,7 +27,8 @@
                help="API key to use when authenticating.",
                secret=True),
     cfg.StrOpt('tenant_name',
-               default=os.environ.get('OS_TENANT_NAME'),
+               default=(os.environ.get('OS_PROJECT_NAME') or
+                        os.environ.get('OS_TENANT_NAME')),
                help="Tenant name to use for API requests."),
     cfg.StrOpt('auth_url',
                default=os.environ.get('OS_AUTH_URL'),