From cf479facb5ca15c6c81aed75eaa5a7d2471c9773 Mon Sep 17 00:00:00 2001 From: Vladyslav Drok Date: Tue, 10 Jan 2017 21:12:13 +0200 Subject: [PATCH] Remove deprecated neutron options This change removes deprecated neutron devstack plugin options from networking-generic-switch jobs and ironic job that uses it. Change-Id: If9690cb44d235d97948574c01a3b64019aed0623 --- jenkins/jobs/ironic.yaml | 2 -- jenkins/jobs/networking-generic-switch.yaml | 4 ---- 2 files changed, 6 deletions(-) diff --git a/jenkins/jobs/ironic.yaml b/jenkins/jobs/ironic.yaml index 55bce1c893..79605beae4 100644 --- a/jenkins/jobs/ironic.yaml +++ b/jenkins/jobs/ironic.yaml @@ -96,8 +96,6 @@ export DEVSTACK_GATE_REMOVE_STACK_SUDO=0 export PROJECTS="openstack/networking-generic-switch $PROJECTS" export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin networking-generic-switch git://git.openstack.org/openstack/networking-generic-switch" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_PLUGIN_EXTRA_CONF_PATH=/etc/neutron/plugins/ml2" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_PLUGIN_EXTRA_CONF_FILES['networking-generic-switch']=ml2_conf_genericswitch.ini" export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_USE_LINK_LOCAL=True" export DEVSTACK_LOCAL_CONFIG+=$'\n'"OVS_PHYSICAL_BRIDGE=brbm" export DEVSTACK_LOCAL_CONFIG+=$'\n'"PHYSICAL_NETWORK=mynetwork" diff --git a/jenkins/jobs/networking-generic-switch.yaml b/jenkins/jobs/networking-generic-switch.yaml index 864edebfbf..102c82cfe7 100644 --- a/jenkins/jobs/networking-generic-switch.yaml +++ b/jenkins/jobs/networking-generic-switch.yaml @@ -26,8 +26,6 @@ export PROJECTS="openstack/networking-generic-switch $PROJECTS" export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin networking-generic-switch https://git.openstack.org/openstack/networking-generic-switch" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_PLUGIN_EXTRA_CONF_PATH=/etc/neutron/plugins/ml2" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_PLUGIN_EXTRA_CONF_FILES['networking-generic-switch']=ml2_conf_genericswitch.ini" export DEVSTACK_LOCAL_CONFIG+=$'\n'"OVS_PHYSICAL_BRIDGE=brbm" export DEVSTACK_LOCAL_CONFIG+=$'\n'"PHYSICAL_NETWORK=mynetwork" export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_PLUGIN=ml2" @@ -78,8 +76,6 @@ export PROJECTS="openstack/networking-generic-switch $PROJECTS" export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin networking-generic-switch https://git.openstack.org/openstack/networking-generic-switch" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_PLUGIN_EXTRA_CONF_PATH=/etc/neutron/plugins/ml2" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_PLUGIN_EXTRA_CONF_FILES['networking-generic-switch']=ml2_conf_genericswitch.ini" export DEVSTACK_LOCAL_CONFIG+=$'\n'"OVS_PHYSICAL_BRIDGE=brbm" export DEVSTACK_LOCAL_CONFIG+=$'\n'"PHYSICAL_NETWORK=mynetwork" export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_PLUGIN=ml2"