Stop adding ServiceAvailable group option
Service available group already exists.Therefore we don't need to register this group here again. Change-Id: I930e53e4934d72ed76735847581932fd227be2f0 Closes-Bug: #1621036
This commit is contained in:
parent
8c056e7e5a
commit
ad24055498
|
@ -12,17 +12,10 @@
|
|||
|
||||
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"),
|
||||
]
|
||||
service_option = 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",
|
||||
|
|
|
@ -14,7 +14,6 @@
|
|||
import os
|
||||
|
||||
from oslo_config import cfg
|
||||
from tempest import config as tempest_config
|
||||
from tempest.test_discover import plugins
|
||||
|
||||
from ironic_inspector.test.inspector_tempest_plugin import config
|
||||
|
@ -29,12 +28,11 @@ 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)
|
||||
conf.register_opt(config.service_option,
|
||||
group='service_available')
|
||||
conf.register_group(config.baremetal_introspection_group)
|
||||
conf.register_opts(config.BaremetalIntrospectionGroup,
|
||||
group="baremetal_introspection")
|
||||
# FIXME(dtantsur): pretend like Neutron does not exist due to random
|
||||
# failures, see https://bugs.launchpad.net/bugs/1621791.
|
||||
cfg.CONF.set_override('neutron', False, 'service_available')
|
||||
|
@ -43,5 +41,5 @@ class InspectorTempestPlugin(plugins.TempestPlugin):
|
|||
return [
|
||||
(config.baremetal_introspection_group.name,
|
||||
config.BaremetalIntrospectionGroup),
|
||||
('service_available', config.ServiceAvailableGroup)
|
||||
('service_available', [config.service_option])
|
||||
]
|
||||
|
|
Loading…
Reference in New Issue