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
diff --git a/common/config.py b/common/config.py
index 3983792..fd6ccbf 100644
--- a/common/config.py
+++ b/common/config.py
@@ -17,8 +17,13 @@
import heat_integrationtests
-IntegrationTestGroup = [
+heat_group = cfg.OptGroup(name="heat_plugin",
+ title="Heat Service Options")
+HeatGroup = [
+ cfg.StrOpt("catalog_type",
+ default="orchestration",
+ help="Catalog type of the orchestration service."),
cfg.StrOpt('username',
default=os.environ.get('OS_USERNAME'),
help="Username to use for non admin API requests."),
@@ -162,10 +167,10 @@
conf(args=[], project='heat_integrationtests',
default_config_files=default_config_files)
- for opt in IntegrationTestGroup:
- conf.register_opt(opt)
+ for group, opts in list_opts():
+ conf.register_opts(opts, group=group)
return conf
def list_opts():
- yield None, IntegrationTestGroup
+ yield heat_group.name, HeatGroup