diff options
| author | Christian Berendt <berendt@betacloud-solutions.de> | 2016-06-16 12:55:55 +0200 |
|---|---|---|
| committer | Christian Berendt <christian@berendt.io> | 2016-06-18 15:53:12 +0000 |
| commit | a7f93b09bbdab093dce7a0ece41dfbf37200f970 (patch) | |
| tree | ca97029e22413e92ea8ab063461663470cde11b2 | |
| parent | 2cb0f445bba72d5b085856deb57a5e48c5832ca9 (diff) | |
| download | kolla-a7f93b09bbdab093dce7a0ece41dfbf37200f970.tar.gz kolla-a7f93b09bbdab093dce7a0ece41dfbf37200f970.zip | |
Make Neutron QoS service plugin configurable
This introduces a new configuration parameter neutron_enable_qos to
be able to enable the Neutron QoS service plugin.
More details about the Neutron QoS service plugin are available at:
http://docs.openstack.org/liberty/networking-guide/adv-config-qos.html
Change-Id: I8525bf4dce5f1e225f72a4e1c3760b64a36b17f6
Closes-bug: #1593183
Implements: bp netowrking-qos
| -rw-r--r-- | ansible/group_vars/all.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/neutron/templates/ml2_conf.ini.j2 | 4 | ||||
| -rw-r--r-- | ansible/roles/neutron/templates/neutron.conf.j2 | 2 | ||||
| -rw-r--r-- | etc/kolla/globals.yml | 1 |
4 files changed, 7 insertions, 1 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 007919e9b..d3b66fb62 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -205,6 +205,7 @@ enable_mistral: "no" enable_mongodb: "no" enable_murano: "no" enable_neutron_lbaas: "no" +enable_neutron_qos: "no" enable_swift: "no" ironic_keystone_user: "ironic" diff --git a/ansible/roles/neutron/templates/ml2_conf.ini.j2 b/ansible/roles/neutron/templates/ml2_conf.ini.j2 index 204cf8061..3cb4f157f 100644 --- a/ansible/roles/neutron/templates/ml2_conf.ini.j2 +++ b/ansible/roles/neutron/templates/ml2_conf.ini.j2 @@ -15,6 +15,10 @@ mechanism_drivers = openvswitch,l2population mechanism_drivers = linuxbridge,l2population {% endif %} +{% if enable_neutron_qos | bool %} +extension_drivers = qos +{% endif %} + [ml2_type_vlan] {% if enable_ironic | bool %} network_vlan_ranges = physnet1 diff --git a/ansible/roles/neutron/templates/neutron.conf.j2 b/ansible/roles/neutron/templates/neutron.conf.j2 index a15a0007d..d50ac538d 100644 --- a/ansible/roles/neutron/templates/neutron.conf.j2 +++ b/ansible/roles/neutron/templates/neutron.conf.j2 @@ -32,7 +32,7 @@ host = {{ ansible_hostname }}_{{ item }} allow_overlapping_ips = true core_plugin = ml2 -service_plugins = router{% if enable_neutron_lbaas | bool %},neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2{% endif %} +service_plugins = router{% if enable_neutron_lbaas | bool %},neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2{% endif %}{% if enable_neutron_qos | bool %},qos{% endif %} {% if enable_neutron_lbaas | bool %} [service_providers] diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index c32aa87db..edce80053 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -119,6 +119,7 @@ neutron_external_interface: "eth1" #enable_mongodb: "no" #enable_murano: "no" #enable_neutron_lbaas: "no" +#enable_neutron_qos: "no" #enable_swift: "no" |