openstack/project-config
Code Issues Proposed changes

neutron: fix extension_drivers setting for feature/qos

Browse Source 
It turns out that devstack does not apply post-config sections from
localrc but local.conf only [1]. Since devstack-gate uses the former to
configure setup, the hook was not applied.

ml2 plugin for devstack actually allows to pass the desired extensions
thru Q_ML2_PLUGIN_EXT_DRIVERS= variable, so let's use it instead of
making devstack post-config hooks localrc-aware.

This is already the third patch we have to enable the extensions in
gate. Sigh.

[1]: http://git.openstack.org/cgit/openstack-dev/devstack/tree/stack.sh#n1152

Change-Id: I51f28b63400b6322baed7ac28715590c391ccebd
This commit is contained in:
Ihar Hrachyshka 2015-07-28 07:59:27 +02:00
parent 9833336558
commit 3882171ffa
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jenkins/jobs/devstack-gate.yaml
View File

@ -474,10 +474,8 @@
# enable qos service plugin # enable qos service plugin
export DEVSTACK_LOCAL_CONFIG="Q_SERVICE_PLUGIN_CLASSES=qos" export DEVSTACK_LOCAL_CONFIG="Q_SERVICE_PLUGIN_CLASSES=qos"
# also enable qos ml2 extension driver # also enable qos ml2 extension driver
export DEVSTACK_LOCAL_CONFIG+=$'\n'"[[post-config|/\$Q_PLUGIN_CONF_FILE]]" # (port_security is enabled in default gate job)
export DEVSTACK_LOCAL_CONFIG+=$'\n'"[ml2]" export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ML2_PLUGIN_EXT_DRIVERS=port_security,qos"
# port_security is enabled by default
export DEVSTACK_LOCAL_CONFIG+=$'\n'"extension_drivers = port_security,qos"
fi fi
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
@ -1138,10 +1136,8 @@
# enable qos service plugin # enable qos service plugin
export DEVSTACK_LOCAL_CONFIG="Q_SERVICE_PLUGIN_CLASSES=qos" export DEVSTACK_LOCAL_CONFIG="Q_SERVICE_PLUGIN_CLASSES=qos"
# also enable qos ml2 extension driver # also enable qos ml2 extension driver
export DEVSTACK_LOCAL_CONFIG+=$'\n'"[[post-config|/\$Q_PLUGIN_CONF_FILE]]" # (port_security is enabled in default gate job)
export DEVSTACK_LOCAL_CONFIG+=$'\n'"[ml2]" export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ML2_PLUGIN_EXT_DRIVERS=port_security,qos"
# port_security is enabled by default
export DEVSTACK_LOCAL_CONFIG+=$'\n'"extension_drivers = port_security,qos"
fi fi
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh

18
jenkins/jobs/neutron.yaml
View File

@ -29,10 +29,8 @@
# enable qos service plugin # enable qos service plugin
export DEVSTACK_LOCAL_CONFIG="Q_SERVICE_PLUGIN_CLASSES=qos" export DEVSTACK_LOCAL_CONFIG="Q_SERVICE_PLUGIN_CLASSES=qos"
# also enable qos ml2 extension driver # also enable qos ml2 extension driver
export DEVSTACK_LOCAL_CONFIG+=$'\n'"[[post-config|/\$Q_PLUGIN_CONF_FILE]]" # (port_security is enabled in default gate job)
export DEVSTACK_LOCAL_CONFIG+=$'\n'"[ml2]" export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ML2_PLUGIN_EXT_DRIVERS=port_security,qos"
# port_security is enabled by default
export DEVSTACK_LOCAL_CONFIG+=$'\n'"extension_drivers = port_security,qos"
fi fi
function gate_hook {{ function gate_hook {{
@ -90,10 +88,8 @@
# enable qos service plugin # enable qos service plugin
export DEVSTACK_LOCAL_CONFIG="Q_SERVICE_PLUGIN_CLASSES=qos" export DEVSTACK_LOCAL_CONFIG="Q_SERVICE_PLUGIN_CLASSES=qos"
# also enable qos ml2 extension driver # also enable qos ml2 extension driver
export DEVSTACK_LOCAL_CONFIG+=$'\n'"[[post-config|/\$Q_PLUGIN_CONF_FILE]]" # (port_security is enabled in default gate job)
export DEVSTACK_LOCAL_CONFIG+=$'\n'"[ml2]" export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ML2_PLUGIN_EXT_DRIVERS=port_security,qos"
# port_security is enabled by default
export DEVSTACK_LOCAL_CONFIG+=$'\n'"extension_drivers = port_security,qos"
fi fi
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
@ -281,10 +277,8 @@
# enable qos service plugin # enable qos service plugin
export DEVSTACK_LOCAL_CONFIG="Q_SERVICE_PLUGIN_CLASSES=qos" export DEVSTACK_LOCAL_CONFIG="Q_SERVICE_PLUGIN_CLASSES=qos"
# also enable qos ml2 extension driver # also enable qos ml2 extension driver
export DEVSTACK_LOCAL_CONFIG+=$'\n'"[[post-config|/\$Q_PLUGIN_CONF_FILE]]" # (port_security is enabled in default gate job)
export DEVSTACK_LOCAL_CONFIG+=$'\n'"[ml2]" export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ML2_PLUGIN_EXT_DRIVERS=port_security,qos"
# port_security is enabled by default
export DEVSTACK_LOCAL_CONFIG+=$'\n'"extension_drivers = port_security,qos"
fi fi
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh