From bf9dffc8156210424f3f6c8cc785d7da176a4614 Mon Sep 17 00:00:00 2001 From: Bar RH Date: Fri, 22 Dec 2017 19:00:27 +0200 Subject: [PATCH] Update configuration samples (QoS) Enable QoS support. We rely on Neutron's devstack plugin script to set the correct configuration. Change-Id: Idd99af81cafd4c8fc541ca8664c844b5473bb39a --- devstack/contrib/new-octavia-devstack.sh | 3 ++- devstack/samples/multinode/local-2.conf | 2 ++ devstack/samples/multinode/local.conf | 4 +++- devstack/samples/singlenode/local.conf | 6 ++++-- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/devstack/contrib/new-octavia-devstack.sh b/devstack/contrib/new-octavia-devstack.sh index 7b67fbfaa4..8631c438bf 100755 --- a/devstack/contrib/new-octavia-devstack.sh +++ b/devstack/contrib/new-octavia-devstack.sh @@ -16,6 +16,7 @@ git clone https://github.com/openstack-dev/devstack.git $HOME/devstack cat < $HOME/devstack/localrc enable_plugin barbican https://review.openstack.org/openstack/barbican +enable_plugin neutron https://review.openstack.org/openstack/neutron enable_plugin octavia https://review.openstack.org/openstack/octavia LIBS_FROM_GIT+=python-octaviaclient @@ -39,7 +40,7 @@ ENABLED_SERVICES+=,placement-api,placement-client # Glance ENABLED_SERVICES+=,g-api,g-reg # Neutron -ENABLED_SERVICES+=,q-svc,q-agt,q-dhcp,q-l3,q-meta,neutron +ENABLED_SERVICES+=,neutron,q-agt,q-dhcp,q-l3,q-meta,q-qos,q-svc # Tempest (optional) #ENABLED_SERVICES+=,tempest # Octavia diff --git a/devstack/samples/multinode/local-2.conf b/devstack/samples/multinode/local-2.conf index 64a2652ba2..71c839f8db 100644 --- a/devstack/samples/multinode/local-2.conf +++ b/devstack/samples/multinode/local-2.conf @@ -7,6 +7,7 @@ RECLONE=True # Load the external LBaaS plugin. +enable_plugin neutron https://git.openstack.org/openstack/neutron enable_plugin octavia https://git.openstack.org/openstack/octavia LIBS_FROM_GIT+=python-octaviaclient @@ -26,6 +27,7 @@ enable_service n-cpu # Neutron enable_service neutron enable_service q-agt +enable_service q-qos # LBaaS V2 and Octavia enable_service octavia diff --git a/devstack/samples/multinode/local.conf b/devstack/samples/multinode/local.conf index 67ee15cea2..62e4726807 100644 --- a/devstack/samples/multinode/local.conf +++ b/devstack/samples/multinode/local.conf @@ -7,9 +7,10 @@ RECLONE=True # Load the external Octavia plugin. +enable_plugin barbican https://git.openstack.org/openstack/barbican +enable_plugin neutron https://git.openstack.org/openstack/neutron enable_plugin octavia-dashboard https://git.openstack.org/openstack/octavia-dashboard enable_plugin octavia https://git.openstack.org/openstack/octavia -enable_plugin barbican https://git.openstack.org/openstack/barbican LIBS_FROM_GIT+=python-octaviaclient DATABASE_PASSWORD=password @@ -51,6 +52,7 @@ enable_service q-agt enable_service q-dhcp enable_service q-l3 enable_service q-meta +enable_service q-qos # Octavia enable_service octavia diff --git a/devstack/samples/singlenode/local.conf b/devstack/samples/singlenode/local.conf index d31288396b..c8f16be14b 100644 --- a/devstack/samples/singlenode/local.conf +++ b/devstack/samples/singlenode/local.conf @@ -20,9 +20,10 @@ RECLONE=True # Load the external Octavia plugin. -enable_plugin octavia-dashboard https://git.openstack.org/openstack/octavia-dashboard -enable_plugin octavia https://git.openstack.org/openstack/octavia enable_plugin barbican https://git.openstack.org/openstack/barbican +enable_plugin neutron https://git.openstack.org/openstack/neutron +enable_plugin octavia https://git.openstack.org/openstack/octavia +enable_plugin octavia-dashboard https://git.openstack.org/openstack/octavia-dashboard LIBS_FROM_GIT+=python-octaviaclient DATABASE_PASSWORD=password @@ -64,6 +65,7 @@ enable_service q-agt enable_service q-dhcp enable_service q-l3 enable_service q-meta +enable_service q-qos # Octavia enable_service octavia