Merge "Fix tempest.conf generation"

This commit is contained in:
Jenkins 2016-08-30 15:39:43 +00:00 committed by Gerrit Code Review
commit 036fb5103d
2 changed files with 17 additions and 2 deletions

View File

@ -14,6 +14,15 @@ from oslo_config import cfg
from tempest import config # noqa
service_available_group = cfg.OptGroup(name="service_available",
title="Available OpenStack Services")
ServiceAvailableGroup = [
cfg.BoolOpt("ironic-inspector",
default=True,
help="Whether or not ironic-inspector is expected to be"
" available"),
]
baremetal_introspection_group = cfg.OptGroup(
name="baremetal_introspection",

View File

@ -28,10 +28,16 @@ class InspectorTempestPlugin(plugins.TempestPlugin):
return full_test_dir, base_path
def register_opts(self, conf):
tempest_config.register_opt_group(
conf, config.service_available_group,
config.ServiceAvailableGroup)
tempest_config.register_opt_group(
conf, config.baremetal_introspection_group,
config.BaremetalIntrospectionGroup)
def get_opt_lists(self):
return [(config.baremetal_introspection_group.name,
config.BaremetalIntrospectionGroup)]
return [
(config.baremetal_introspection_group.name,
config.BaremetalIntrospectionGroup),
('service_available', config.ServiceAvailableGroup)
]