From fe1bf7137fa11d555cc806be4b4462a4581c7f54 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Mon, 11 Sep 2017 10:30:56 +0100 Subject: [PATCH] Stop using Q_PLUGIN_EXTRA_CONF_{PATH|FILES} variables DevStack variables Q_PLUGIN_EXTRA_CONF_{PATH|FILES} were deprecated during the Ocata cycle. Instead, plugins should leverage the neutron_server_config_add function. The networking-generic-switch DevStack plugin was updated to use this function in commit a656b25d037ad250647ae1484e75d9d4633ba373. Using the deprecated variables is causing installation failures of the DevStack configuration for Ironic multitenant networking. This patch stops using them, which solves the installation issues. Change-Id: If78640a46c3b8b2bfb5627de183a1fea45b777cf Closes-Bug: #1715879 --- doc/source/contributor/ironic-multitenant-networking.rst | 2 -- 1 file changed, 2 deletions(-) diff --git a/doc/source/contributor/ironic-multitenant-networking.rst b/doc/source/contributor/ironic-multitenant-networking.rst index df091c0b84..15e72d277d 100644 --- a/doc/source/contributor/ironic-multitenant-networking.rst +++ b/doc/source/contributor/ironic-multitenant-networking.rst @@ -29,8 +29,6 @@ configured in Neutron. # Install networking-generic-switch Neutron ML2 driver that interacts with OVS enable_plugin networking-generic-switch https://git.openstack.org/openstack/networking-generic-switch - Q_PLUGIN_EXTRA_CONF_PATH=/etc/neutron/plugins/ml2 - Q_PLUGIN_EXTRA_CONF_FILES['networking-generic-switch']=ml2_conf_genericswitch.ini # Add link local info when registering Ironic node IRONIC_USE_LINK_LOCAL=True