commit 1608b324f13824b2572e6a175ef6e55c9820eb63
author David Lyle <dklyle0@gmail.com> Wed May 04 09:26:52 2016 -0600
committer David Lyle <dklyle0@gmail.com> Wed May 04 09:26:52 2016 -0600
tree 245a0fefd19f37ecbfa90ccfa40e0a4b6e5f8cc6
parent b49b7630ef333e12ec5770ca1bb9b7014cf15209
parent aec2ef549a86b5098c413f30ad164eeb68b0c0c9

Merge pull request #1 from mtreinish/master

Fix configuration setup

tempest_horizon/config.py

diff --git a/tempest_horizon/config.py b/tempest_horizon/config.py
index bb53abb..7866d0b 100644
--- a/tempest_horizon/config.py
+++ b/tempest_horizon/config.py
@@ -24,3 +24,7 @@
                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")

tempest_horizon/plugin.py

diff --git a/tempest_horizon/plugin.py b/tempest_horizon/plugin.py
index 490abe0..47666be 100644
--- a/tempest_horizon/plugin.py
+++ b/tempest_horizon/plugin.py
@@ -29,7 +29,10 @@
     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)]