openstack
/
ironic-inspector
Code Issues Proposed changes

Merge "Stop adding ServiceAvailable group option"

This commit is contained in:
Jenkins 2016-10-12 09:22:08 +00:00 committed by Gerrit Code Review
parent 1caf168173 ad24055498
commit 95928b4680
2 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ironic_inspector/test/inspector_tempest_plugin/config.py
View File

@ -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
ironic_inspector/test/inspector_tempest_plugin/plugin.py
View File

@ -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])
]