From 4eb77865ab140c7a10e33c0a6fed201e39bac183 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Mon, 17 Oct 2016 14:31:40 +0200 Subject: [PATCH] Only disable Neutron tests when our Grenade is running Unconditionally disabling it in code disables neutron for everyone importing our plugin. Change-Id: I468af14f42b6d9227179e921f5a3ccea2cae0d66 Partial-Bug: #1621791 --- devstack/upgrade/settings | 4 ++++ ironic_inspector/test/inspector_tempest_plugin/plugin.py | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings index 3efcc8cb0..a4cd6e2a5 100644 --- a/devstack/upgrade/settings +++ b/devstack/upgrade/settings @@ -12,3 +12,7 @@ devstack_localrc base enable_service ironic-inspector ironic-inspector-dhcp devstack_localrc target enable_plugin ironic-inspector https://github.com/openstack/ironic-inspector devstack_localrc target enable_service ironic-inspector ironic-inspector-dhcp + +# NOTE(dtantsur): enable possible work arounds for grenade specifically. +# We can't use shell variables "thanks" to tempest using tox. +touch /tmp/ironic-inspector-grenade diff --git a/ironic_inspector/test/inspector_tempest_plugin/plugin.py b/ironic_inspector/test/inspector_tempest_plugin/plugin.py index 32a6d372f..218f10017 100644 --- a/ironic_inspector/test/inspector_tempest_plugin/plugin.py +++ b/ironic_inspector/test/inspector_tempest_plugin/plugin.py @@ -33,9 +33,10 @@ class InspectorTempestPlugin(plugins.TempestPlugin): 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') + if os.path.exists('/tmp/ironic-inspector-grenade'): + # 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') def get_opt_lists(self): return [