summaryrefslogtreecommitdiff
path: root/heat_integrationtests/common/test.py
diff options
context:
space:
mode:
authorSteve Baker <sbaker@redhat.com>2016-07-27 23:31:50 +0000
committerSteve Baker <sbaker@redhat.com>2016-08-03 01:59:46 +0000
commit395cfbd1dd23e044adc727f8ba52cf63dc586b6a (patch)
tree8617d0df33a64e1d40fc9325512f9fa2e659926a /heat_integrationtests/common/test.py
parent6c9f33dade53c1e8a010954484538a15ea92a990 (diff)
downloadheat-395cfbd1dd23e044adc727f8ba52cf63dc586b6a.tar.gz
Adopt tempest plugin config namespace
As a transition strategy to running heat_integrationtests as a tempest plugin, this change puts the test config values in the "heat_plugin" section. This will allow for either test runner to be used during the transition. blueprint tempest-plugin-support Change-Id: I2eab50be92c998aeb1ee98011908a9828a7efe6c
Diffstat (limited to 'heat_integrationtests/common/test.py')
-rw-r--r--heat_integrationtests/common/test.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/heat_integrationtests/common/test.py b/heat_integrationtests/common/test.py
index c864d3b7a..413e51f15 100644
--- a/heat_integrationtests/common/test.py
+++ b/heat_integrationtests/common/test.py
@@ -73,7 +73,7 @@ class HeatIntegrationTest(testscenarios.WithScenarios,
def setUp(self):
super(HeatIntegrationTest, self).setUp()
- self.conf = config.init_conf()
+ self.conf = config.init_conf().heat_plugin
self.assertIsNotNone(self.conf.auth_url,
'No auth_url configured')
@@ -106,7 +106,7 @@ class HeatIntegrationTest(testscenarios.WithScenarios,
'No admin username configured')
self.assertIsNotNone(self.conf.admin_password,
'No admin password configured')
- conf = config.init_conf()
+ conf = config.init_conf().heat_plugin
conf.username = self.conf.admin_username
conf.password = self.conf.admin_password
conf.tenant_name = self.conf.admin_tenant_name