Merge "Make Neutron QoS service plugin configurable"

ansible/group_vars/all.yml

@@ -207,6 +207,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"

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

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]

etc/kolla/globals.yml

@@ -120,6 +120,7 @@ neutron_external_interface: "eth1"
 #enable_mongodb: "no"
 #enable_murano: "no"
 #enable_neutron_lbaas: "no"
+#enable_neutron_qos: "no"
 #enable_swift: "no"