commit b9908ce6fd7a13e4949a2f3f43b738dcca8c40c3
author Jenkins <jenkins@review.openstack.org> Tue Jul 19 19:37:26 2016 +0000
committer Gerrit Code Review <review@openstack.org> Tue Jul 19 19:37:26 2016 +0000
tree 07a97e111987bc21230958e3c74cd3fbfeb9db8f
parent 1c984e4034a0058dbb99b780799de735a06e46e3
parent b5e23216eb0ec5480855ebd86924a07a90644417

Merge "Remove the unused tenant and user option in cleanup"

tempest/cmd/cleanup_service.py

diff --git a/tempest/cmd/cleanup_service.py b/tempest/cmd/cleanup_service.py
index 8d2cfdc..426571f 100644
--- a/tempest/cmd/cleanup_service.py
+++ b/tempest/cmd/cleanup_service.py
@@ -67,11 +67,8 @@
     CONF_PRIV_NETWORK_NAME = CONF.compute.fixed_network_name
     CONF_PUB_NETWORK = CONF.network.public_network_id
     CONF_PUB_ROUTER = CONF.network.public_router_id
-    CONF_TENANTS = [CONF.auth.admin_project_name,
-                    CONF.identity.project_name,
-                    CONF.identity.alt_project_name]
-    CONF_USERS = [CONF.auth.admin_username, CONF.identity.username,
-                  CONF.identity.alt_username]
+    CONF_TENANTS = [CONF.auth.admin_project_name]
+    CONF_USERS = [CONF.auth.admin_username]
 
     if IS_NEUTRON:
         CONF_PRIV_NETWORK = _get_network_id(CONF.compute.fixed_network_name,