openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Ensure QoS extension is enabled

Browse Source 
This patch ensures that the linuxbridge/sriov agent files will have
the QoS extension enabled if the deployer has enabled it.

Closes-Bug: 1677632
Change-Id: I32edf772267e0a6e92a86979ceb4d24973750a73
This commit is contained in:
Major Hayden 2017-08-17 09:38:50 -05:00
parent 8c89f5564e
commit a114efa00c
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
templates/plugins/ml2/linuxbridge_agent.ini.j2
View File

@ -25,15 +25,27 @@ enable_vxlan = False
# Agent
[agent]
{% if 'ml2.sriov' in neutron_plugin_types and 'nova_compute' in group_names %}
extensions = fdb
{# If we're deploying this template to a hypervisor, we should make a list #}
{# of extensions that need to be enabled in the agent. #}
{% if 'nova_compute' in group_names %}
{% set _extensions = [] %}
{% if 'ml2.sriov' in neutron_plugin_types %}
{% set _ = _extensions.append['fdb'] %}
{% endif %}
{% if 'qos' in neutron_plugin_base %}
{% set _ = _extensions.append['qos'] %}
{% endif %}
extensions = {{ _extensions | join(',') }}
{% if 'ml2.sriov' in neutron_plugin_types %}
# If an interface is shared between sriov ports and normal ports, it must be defined here
# to allow traffic between the two ports on the same host
[FDB]
shared_physical_device_mappings = {{ neutron_provider_networks.network_sriov_mappings }}
{% endif %}
{% endif %}
# Security groups
[securitygroup]
firewall_driver = {{ neutron_plugins[neutron_plugin_type].driver_firewall }}

7
templates/plugins/ml2/sriov_nic_agent.ini.j2
View File

@ -1,9 +1,14 @@
# {{ ansible_managed }}
# Agent
[agent]
{% if 'qos' in neutron_plugin_base %}
extensions = qos
{% endif %}
[securitygroup]
firewall_driver = neutron.agent.firewall.NoopFirewallDriver
[sriov_nic]
physical_device_mappings = "{{ neutron_provider_networks.network_sriov_mappings }}"
exclude_devices = "{{ neutron_sriov_excluded_devices }}"