Merge pull request #1 from mtreinish/master

Fix configuration setup
This commit is contained in:
David Lyle 2016-05-04 09:26:52 -06:00
commit 1608b324f1
2 changed files with 8 additions and 1 deletions

View File

@ -24,3 +24,7 @@ DashboardGroup = [
help="Login page for the dashboard",
deprecated_for_removal=True),
]
service_opt = cfg.BoolOpt(
'horizon', default=True,
help="Whether or not Horizon is expected to be available")

View File

@ -29,7 +29,10 @@ class HorizonTempestPlugin(plugins.TempestPlugin):
def register_opts(self, conf):
if 'dashboard' not in conf:
config.register_opt_group(conf, dashboard_config.dashboard_group,
dashboard_config.BotoGroup)
dashboard_config.DashboardGroup)
if not getattr(conf.service_available, 'horizon'):
conf.register_opt(dashboard_config.service_opt,
group='service_available')
def get_opt_lists(self):
return [('dashboard', config.DashboardGroup)]