From cb0561a4c744463536309647164959c21fefb399 Mon Sep 17 00:00:00 2001 From: Victor Ryzhenkin Date: Wed, 13 Apr 2016 15:00:43 +0300 Subject: [PATCH] Do not force admin credentials in service broker test suite - Allow tempest to use its default admin credentials usage mechanism for service broker. Change-Id: I08f25abc384fcbb82debee8ef169e42c87eb011b Closes-Bug: #1569449 --- murano_tempest_tests/tests/api/service_broker/base.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/murano_tempest_tests/tests/api/service_broker/base.py b/murano_tempest_tests/tests/api/service_broker/base.py index 450d89bab..51bdc427a 100644 --- a/murano_tempest_tests/tests/api/service_broker/base.py +++ b/murano_tempest_tests/tests/api/service_broker/base.py @@ -121,14 +121,5 @@ class BaseServiceBrokerAdminTest(BaseServiceBrokerTest): @classmethod def resource_setup(cls): - if hasattr(CONF.identity, 'admin_username'): - cls.username = CONF.identity.admin_username - cls.password = CONF.identity.admin_password - cls.tenant_name = CONF.identity.admin_tenant_name - else: - cls.username = CONF.auth.admin_username - cls.password = CONF.auth.admin_password - cls.tenant_name = CONF.auth.admin_tenant_name - cls.verify_nonempty(cls.username, cls.password, cls.tenant_name) cls.os = clients.Manager() super(BaseServiceBrokerAdminTest, cls).resource_setup()