diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 3520f4b7c1a79077a1806bd0077078fca493425e..19712e37b9d94d98b1b3d71dfd3743e871c0d5fc 100644 --- a/ansible/group_vars/all.yml +++ b/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" diff --git a/ansible/roles/neutron/templates/ml2_conf.ini.j2 b/ansible/roles/neutron/templates/ml2_conf.ini.j2 index 204cf806150137b655c7a609de01e07d10db8dcc..3cb4f157fd3f96fd618e30cc7b64aa243f4ebafd 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 a15a0007dfd022a5fb5b386c1c79bc7fa46de0bb..d50ac538dc868a27bbef6ae8a2ccd14a8f292cee 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 dc87cf56adf259cfa9c987c68db968c42d2a6925..d81732e8adc3da222909079ab735357dd9b3bb76 100644 --- a/etc/kolla/globals.yml +++ b/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"