openstack/project-config
Code Issues Proposed changes

Merge "neutron: enable qos ml2 extension driver for feature/qos"

Browse Source
This commit is contained in:
Jenkins 2015-07-24 13:41:31 +00:00 committed by Gerrit Code Review
commit 02ffd2e229
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -471,7 +471,12 @@
fi
# For feature/qos branch, actually enable qos service plugin
if [[ "$BRANCH_OVERRIDE" =~ ^feature/qos$ ]] || [[ "$ZUUL_BRANCH" =~ ^feature/qos$ ]] ; then
# enable qos service plugin
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]]"
# port_security is enabled by default
export DEVSTACK_LOCAL_CONFIG+=$'\n'"extension_drivers = port_security,qos"
fi
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh
@ -1121,7 +1126,12 @@
fi
# For feature/qos branch, actually enable qos service plugin
if [[ "$BRANCH_OVERRIDE" =~ ^feature/qos$ ]] || [[ "$ZUUL_BRANCH" =~ ^feature/qos$ ]] ; then
# enable qos service plugin
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]]"
# port_security is enabled by default
export DEVSTACK_LOCAL_CONFIG+=$'\n'"extension_drivers = port_security,qos"
fi
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh

17
jenkins/jobs/neutron.yaml
View File

@ -26,7 +26,12 @@
fi
# For feature/qos branch, actually enable qos service plugin
if [[ "$BRANCH_OVERRIDE" =~ ^feature/qos$ ]] || [[ "$ZUUL_BRANCH" =~ ^feature/qos$ ]] ; then
# enable qos service plugin
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]]"
# port_security is enabled by default
export DEVSTACK_LOCAL_CONFIG+=$'\n'"extension_drivers = port_security,qos"
fi
function gate_hook {{
@ -81,7 +86,12 @@
fi
# For feature/qos branch, actually enable qos service plugin
if [[ "$BRANCH_OVERRIDE" =~ ^feature/qos$ ]] || [[ "$ZUUL_BRANCH" =~ ^feature/qos$ ]] ; then
# enable qos service plugin
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]]"
# port_security is enabled by default
export DEVSTACK_LOCAL_CONFIG+=$'\n'"extension_drivers = port_security,qos"
fi
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh
@ -266,7 +276,12 @@
fi
# For feature/qos branch, actually enable qos service plugin
if [[ "$BRANCH_OVERRIDE" =~ ^feature/qos$ ]] || [[ "$ZUUL_BRANCH" =~ ^feature/qos$ ]] ; then
export DEVSTACK_LOCAL_CONFIG+="Q_SERVICE_PLUGIN_CLASSES=qos"
# enable qos service plugin
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]]"
# port_security is enabled by default
export DEVSTACK_LOCAL_CONFIG+=$'\n'"extension_drivers = port_security,qos"
fi
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh