summaryrefslogtreecommitdiff
path: root/etc/neutron.conf
diff options
context:
space:
mode:
authorIhar Hrachyshka <ihrachys@redhat.com>2015-08-05 17:15:40 +0200
committerIhar Hrachyshka <ihrachys@redhat.com>2015-08-05 17:15:40 +0200
commitcc0ae6dd49da3e67c1d0400bc422e735c27e98fb (patch)
tree786bc4319d871c6fbf6cb158b94528c48a8e5fcd /etc/neutron.conf
parentdf35d21141dc4544421ccbff8715ea6da3e03def (diff)
parentb0275b6f14d662f3e94f553d61111a45ff009a6c (diff)
Merge remote-tracking branch 'origin/feature/qos' into merge-branch
Notes
Notes (review): Verified+2: Jenkins Code-Review+2: Kyle Mestery <mestery@mestery.com> Code-Review+2: Edgar Magana <emagana@gmail.com> Code-Review+2: mark mcclain <mark@mcclain.xyz> Verified+1: Microsoft Hyper-V CI <hyper-v_ci@microsoft.com> Code-Review+2: Henry Gessau <gessau@cisco.com> Workflow+1: Ihar Hrachyshka <ihrachys@redhat.com> Verified+1: Ryu CI <ryu-openstack-review@lists.sourceforge.net> Code-Review+1: John Schwarz <jschwarz@redhat.com> Submitted-by: Jenkins Submitted-at: Thu, 06 Aug 2015 00:27:23 +0000 Reviewed-on: https://review.openstack.org/209556 Project: openstack/neutron Branch: refs/heads/feature/qos
Diffstat (limited to 'etc/neutron.conf')
-rw-r--r--etc/neutron.conf6
1 files changed, 5 insertions, 1 deletions
diff --git a/etc/neutron.conf b/etc/neutron.conf
index ca3baa9..52ca260 100644
--- a/etc/neutron.conf
+++ b/etc/neutron.conf
@@ -75,7 +75,7 @@
75# of its entrypoint name. 75# of its entrypoint name.
76# 76#
77# service_plugins = 77# service_plugins =
78# Example: service_plugins = router,firewall,lbaas,vpnaas,metering 78# Example: service_plugins = router,firewall,lbaas,vpnaas,metering,qos
79 79
80# Paste configuration file 80# Paste configuration file
81# api_paste_config = api-paste.ini 81# api_paste_config = api-paste.ini
@@ -1017,3 +1017,7 @@ lock_path = $state_path/lock
1017# Deprecated, use rpc_backend=kombu+memory or rpc_backend=fake (boolean value) 1017# Deprecated, use rpc_backend=kombu+memory or rpc_backend=fake (boolean value)
1018# Deprecated group/name - [DEFAULT]/fake_rabbit 1018# Deprecated group/name - [DEFAULT]/fake_rabbit
1019# fake_rabbit = false 1019# fake_rabbit = false
1020
1021[qos]
1022# Drivers list to use to send the update notification
1023# notification_drivers = message_queue