openstack/kolla
Code Issues Proposed changes

Merge "Make Neutron QoS service plugin configurable"

Browse Source
This commit is contained in:
Jenkins 2016-06-20 10:55:00 +00:00 committed by Gerrit Code Review
commit 7f447eb354
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/group_vars/all.yml
View File

@ -207,6 +207,7 @@ enable_mistral: "no"
enable_mongodb: "no" enable_mongodb: "no"
enable_murano: "no" enable_murano: "no"
enable_neutron_lbaas: "no" enable_neutron_lbaas: "no"
enable_neutron_qos: "no"
enable_swift: "no" enable_swift: "no"
ironic_keystone_user: "ironic" ironic_keystone_user: "ironic"

4
ansible/roles/neutron/templates/ml2_conf.ini.j2
View File

@ -15,6 +15,10 @@ mechanism_drivers = openvswitch,l2population
mechanism_drivers = linuxbridge,l2population mechanism_drivers = linuxbridge,l2population
{% endif %} {% endif %}
{% if enable_neutron_qos | bool %}
extension_drivers = qos
{% endif %}
[ml2_type_vlan] [ml2_type_vlan]
{% if enable_ironic | bool %} {% if enable_ironic | bool %}
network_vlan_ranges = physnet1 network_vlan_ranges = physnet1

2
ansible/roles/neutron/templates/neutron.conf.j2
View File

@ -32,7 +32,7 @@ host = {{ ansible_hostname }}_{{ item }}
allow_overlapping_ips = true allow_overlapping_ips = true
core_plugin = ml2 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 %} {% if enable_neutron_lbaas | bool %}
[service_providers] [service_providers]

1
etc/kolla/globals.yml
View File

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