Merge "devstack: don't enable qos service with the plugin"

2016-01-09 17:10:23 +00:00 · 2016-01-09 17:10:23 +00:00 · 6c5ecdc0e6
commit 6c5ecdc0e6
parent aa9cc3f9da e58a0e5062
2 changed files with 1 additions and 2 deletions
--- a/devstack/settings
+++ b/devstack/settings
@ -1,3 +1 @@
 L2_AGENT_EXTENSIONS=${L2_AGENT_EXTENSIONS:-}
-
-enable_service q-qos
--- a/neutron/tests/contrib/gate_hook.sh
+++ b/neutron/tests/contrib/gate_hook.sh
@ -35,6 +35,7 @@ EOF
    export DEVSTACK_LOCAL_CONFIG+="
 enable_plugin neutron-vpnaas git://git.openstack.org/openstack/neutron-vpnaas
 enable_plugin neutron git://git.openstack.org/openstack/neutron
+enable_service q-qos
 "

    $BASE/new/devstack-gate/devstack-vm-gate.sh