From c4c5490e1838503d7d7dfd3d12b2b0c5fc4cfa46 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sat, 25 Jul 2015 10:03:37 +0200 Subject: [PATCH] Fixed devstack configuration for neutron feature/qos branch [ml2] section was missing from post-config section, and this resulted in extension_drivers setting not being applied to ml2_conf.ini, as expected. Tested the new post-config section locally with devstack, it results in setting being applied. Change-Id: I421c42aef2cf558935f91a6634a5a5b16e55a606 --- jenkins/jobs/devstack-gate.yaml | 2 ++ jenkins/jobs/neutron.yaml | 3 +++ 2 files changed, 5 insertions(+) diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml index 0853ba37b9..27cbd5a661 100644 --- a/jenkins/jobs/devstack-gate.yaml +++ b/jenkins/jobs/devstack-gate.yaml @@ -475,6 +475,7 @@ export DEVSTACK_LOCAL_CONFIG="Q_SERVICE_PLUGIN_CLASSES=qos" # also enable qos ml2 extension driver export DEVSTACK_LOCAL_CONFIG+=$'\n'"[[post-config|/\$Q_PLUGIN_CONF_FILE]]" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"[ml2]" # port_security is enabled by default export DEVSTACK_LOCAL_CONFIG+=$'\n'"extension_drivers = port_security,qos" fi @@ -1130,6 +1131,7 @@ export DEVSTACK_LOCAL_CONFIG="Q_SERVICE_PLUGIN_CLASSES=qos" # also enable qos ml2 extension driver export DEVSTACK_LOCAL_CONFIG+=$'\n'"[[post-config|/\$Q_PLUGIN_CONF_FILE]]" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"[ml2]" # port_security is enabled by default export DEVSTACK_LOCAL_CONFIG+=$'\n'"extension_drivers = port_security,qos" fi diff --git a/jenkins/jobs/neutron.yaml b/jenkins/jobs/neutron.yaml index 923c736036..c00b0a5163 100644 --- a/jenkins/jobs/neutron.yaml +++ b/jenkins/jobs/neutron.yaml @@ -30,6 +30,7 @@ export DEVSTACK_LOCAL_CONFIG="Q_SERVICE_PLUGIN_CLASSES=qos" # also enable qos ml2 extension driver export DEVSTACK_LOCAL_CONFIG+=$'\n'"[[post-config|/\$Q_PLUGIN_CONF_FILE]]" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"[ml2]" # port_security is enabled by default export DEVSTACK_LOCAL_CONFIG+=$'\n'"extension_drivers = port_security,qos" fi @@ -90,6 +91,7 @@ export DEVSTACK_LOCAL_CONFIG="Q_SERVICE_PLUGIN_CLASSES=qos" # also enable qos ml2 extension driver export DEVSTACK_LOCAL_CONFIG+=$'\n'"[[post-config|/\$Q_PLUGIN_CONF_FILE]]" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"[ml2]" # port_security is enabled by default export DEVSTACK_LOCAL_CONFIG+=$'\n'"extension_drivers = port_security,qos" fi @@ -280,6 +282,7 @@ export DEVSTACK_LOCAL_CONFIG="Q_SERVICE_PLUGIN_CLASSES=qos" # also enable qos ml2 extension driver export DEVSTACK_LOCAL_CONFIG+=$'\n'"[[post-config|/\$Q_PLUGIN_CONF_FILE]]" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"[ml2]" # port_security is enabled by default export DEVSTACK_LOCAL_CONFIG+=$'\n'"extension_drivers = port_security,qos" fi