Merge "Fixed devstack configuration for neutron feature/qos branch"

This commit is contained in:
Jenkins 2015-07-27 00:48:12 +00:00 committed by Gerrit Code Review
commit ddb2125143
2 changed files with 5 additions and 0 deletions

View File

@ -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
@ -1138,6 +1139,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

View File

@ -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