commit be38c30ffdfc779334f762b795832d4609f93701
author rabi <ramishra@redhat.com> Tue Apr 11 09:54:07 2017 +0530
committer rabi <ramishra@redhat.com> Tue Apr 11 10:29:26 2017 +0530
tree 6712eda96927f92f507e7d90584a77d11823574b
parent ffdd10f9c692e5a80a08e3771741e2060f43485b

Use project_name/admin_project_name config option

This deprecates the tenant_name and admin_tenant_name config option
for integration tests.

Change-Id: Iabc56ddabeeda36d27ea3c9ce04c71e13be676d7

common/config.py

diff --git a/common/config.py b/common/config.py
index 2236a0c..baf8380 100644
--- a/common/config.py
+++ b/common/config.py
@@ -40,11 +40,15 @@
     cfg.StrOpt('admin_password',
                help="Admin API key to use when authentication.",
                secret=True),
-    cfg.StrOpt('tenant_name',
-               help="Tenant name to use for API requests."),
-    cfg.StrOpt('admin_tenant_name',
+    cfg.StrOpt('project_name',
+               help="Project name to use for API requests.",
+               deprecated_opts=[cfg.DeprecatedOpt('tenant_name',
+                                                  group='heat_plugin')]),
+    cfg.StrOpt('admin_project_name',
                default='admin',
-               help="Admin tenant name to use for admin API requests."),
+               help="Admin project name to use for admin API requests.",
+               deprecated_opts=[cfg.DeprecatedOpt('admin_tenant_name',
+                                                  group='heat_plugin')]),
     cfg.StrOpt('auth_url',
                help="Full URI of the OpenStack Identity API (Keystone)"),
     cfg.StrOpt('user_domain_name',