Ensure QoS extension is enabled
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:
parent
8c89f5564e
commit
a114efa00c
|
@ -25,15 +25,27 @@ enable_vxlan = False
|
||||||
|
|
||||||
# Agent
|
# Agent
|
||||||
[agent]
|
[agent]
|
||||||
{% if 'ml2.sriov' in neutron_plugin_types and 'nova_compute' in group_names %}
|
{# If we're deploying this template to a hypervisor, we should make a list #}
|
||||||
extensions = fdb
|
{# 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
|
# 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
|
# to allow traffic between the two ports on the same host
|
||||||
[FDB]
|
[FDB]
|
||||||
shared_physical_device_mappings = {{ neutron_provider_networks.network_sriov_mappings }}
|
shared_physical_device_mappings = {{ neutron_provider_networks.network_sriov_mappings }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
# Security groups
|
# Security groups
|
||||||
[securitygroup]
|
[securitygroup]
|
||||||
firewall_driver = {{ neutron_plugins[neutron_plugin_type].driver_firewall }}
|
firewall_driver = {{ neutron_plugins[neutron_plugin_type].driver_firewall }}
|
||||||
|
|
|
@ -1,9 +1,14 @@
|
||||||
# {{ ansible_managed }}
|
# {{ ansible_managed }}
|
||||||
|
|
||||||
|
# Agent
|
||||||
|
[agent]
|
||||||
|
{% if 'qos' in neutron_plugin_base %}
|
||||||
|
extensions = qos
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
[securitygroup]
|
[securitygroup]
|
||||||
firewall_driver = neutron.agent.firewall.NoopFirewallDriver
|
firewall_driver = neutron.agent.firewall.NoopFirewallDriver
|
||||||
|
|
||||||
[sriov_nic]
|
[sriov_nic]
|
||||||
physical_device_mappings = "{{ neutron_provider_networks.network_sriov_mappings }}"
|
physical_device_mappings = "{{ neutron_provider_networks.network_sriov_mappings }}"
|
||||||
exclude_devices = "{{ neutron_sriov_excluded_devices }}"
|
exclude_devices = "{{ neutron_sriov_excluded_devices }}"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue