openstack
/
tripleo-ansible
Code Issues Proposed changes

Merge "Drop use of role_networks_lower"

This commit is contained in:
Zuul 2020-12-05 06:54:01 +00:00 committed by Gerrit Code Review
parent 6881079d12 2018260328
commit 9f071bad6d
14 changed files with 99 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tripleo_ansible/roles/tripleo_network_config/templates/2_linux_bonds_vlans/2_linux_bonds_vlans.j2
View File

@ -8,14 +8,14 @@
{# The bridge, bond or interface must have an MTU to allow the VLAN with the #} {# The bridge, bond or interface must have an MTU to allow the VLAN with the #}
{# largest MTU. #} {# largest MTU. #}
{% if network.startswith('Tenant') %} {% if network.startswith('Tenant') %}
{{ mtu_dataplane_list.append(lookup('vars', role_networks_lower[network] ~ '_mtu')) }} {{ mtu_dataplane_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
{# This block resolves the minimum viable MTU for interfaces connected to #} {# This block resolves the minimum viable MTU for interfaces connected to #}
{# the control plane network(s) (don't start by "Tenant"), and also bonds #} {# the control plane network(s) (don't start by "Tenant"), and also bonds #}
{# and bridges that carry multiple VLANs. Each VLAN may have different MTU. #} {# and bridges that carry multiple VLANs. Each VLAN may have different MTU. #}
{# The bridge, bond or interface must have an MTU to allow the VLAN with the #} {# The bridge, bond or interface must have an MTU to allow the VLAN with the #}
{# largest MTU. #} {# largest MTU. #}
{% else %} {% else %}
{{ mtu_ctlplane_list.append(lookup('vars', role_networks_lower[network] ~ '_mtu')) }} {{ mtu_ctlplane_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
{%- endfor %} {%- endfor %}
{% set min_viable_mtu_ctlplane = mtu_ctlplane_list | max %} {% set min_viable_mtu_ctlplane = mtu_ctlplane_list | max %}
{% set min_viable_mtu_dataplane = mtu_dataplane_list | max %} {% set min_viable_mtu_dataplane = mtu_dataplane_list | max %}
@ -45,11 +45,11 @@ network_config:
{% for network in role_networks if not network.startswith('Tenant') %} {% for network in role_networks if not network.startswith('Tenant') %}
- type: vlan - type: vlan
device: bond_api device: bond_api
mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }} mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
vlan_id: {{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }} vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
addresses: addresses:
- ip_netmask: {{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }} - ip_netmask: {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }} routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
{% endfor %} {% endfor %}
- type: ovs_bridge - type: ovs_bridge
name: {{ neutron_physical_bridge_name }} name: {{ neutron_physical_bridge_name }}
@ -70,9 +70,9 @@ network_config:
{% for network in role_networks if network.startswith('Tenant') %} {% for network in role_networks if network.startswith('Tenant') %}
- type: vlan - type: vlan
device: bond-data device: bond-data
mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }} mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
vlan_id: {{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }} vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
addresses: addresses:
- ip_netmask: {{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }} - ip_netmask: {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }} routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
{%- endfor %} {%- endfor %}

18
tripleo_ansible/roles/tripleo_network_config/templates/2_linux_bonds_vlans/2_linux_bonds_vlans_dpdk.j2
View File

@ -6,7 +6,7 @@
{% set mtu_list = [] %} {% set mtu_list = [] %}
{{ mtu_list.append(lookup('vars', ctlplane_mtu)) }} {{ mtu_list.append(lookup('vars', ctlplane_mtu)) }}
{% for network in role_networks %} {% for network in role_networks %}
{{ mtu_list.append(lookup('vars', role_networks_lower[network] ~ '_mtu')) }} {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
{%- endfor %} {%- endfor %}
{% set min_viable_mtu = mtu_list | max %} {% set min_viable_mtu = mtu_list | max %}
network_config: network_config:
@ -35,24 +35,24 @@ network_config:
{% for network in role_networks if not network.startswith('Tenant') %} {% for network in role_networks if not network.startswith('Tenant') %}
- type: vlan - type: vlan
device: bond_api device: bond_api
mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }} mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
vlan_id: {{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }} vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
addresses: addresses:
- ip_netmask: {{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }} - ip_netmask: {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }} routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
{% endfor %} {% endfor %}
{# Special config for OVS DPDK #} {# Special config for OVS DPDK #}
- type: ovs_user_bridge - type: ovs_user_bridge
name: br-dpdk0 name: br-dpdk0
use_dhcp: false use_dhcp: false
{% for network in role_networks if network.startswith('Tenant') %} {% for network in role_networks if network.startswith('Tenant') %}
ovs_extra: "set port br-dpdk0 tag={{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }}" ovs_extra: "set port br-dpdk0 tag={{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}"
addresses: addresses:
- ip_netmask: {{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr')}} - ip_netmask: {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr')}}
{% if default_route_networks and network in default_route_networks %} {% if default_route_networks and network in default_route_networks %}
routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') + [{'default': true, 'next_hop': lookup('vars', role_networks_lower[network] ~ '_gateway_ip')}] }} routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') + [{'default': true, 'next_hop': lookup('vars', networks_lower[network] ~ '_gateway_ip')}] }}
{% else %} {% else %}
routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }} routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
{% endif %} {% endif %}
{%- endfor %} {%- endfor %}
members: members:

10
tripleo_ansible/roles/tripleo_network_config/templates/bonds_vlans/bonds_vlans.j2
View File

@ -1,7 +1,7 @@
--- ---
{% set mtu_list = [ctlplane_mtu] %} {% set mtu_list = [ctlplane_mtu] %}
{% for network in role_networks %} {% for network in role_networks %}
{{ mtu_list.append(lookup('vars', role_networks_lower[network] ~ '_mtu')) }} {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
{%- endfor %} {%- endfor %}
{% set min_viable_mtu = mtu_list | max %} {% set min_viable_mtu = mtu_list | max %}
network_config: network_config:
@ -31,9 +31,9 @@ network_config:
mtu: {{ min_viable_mtu }} mtu: {{ min_viable_mtu }}
{% for network in role_networks %} {% for network in role_networks %}
- type: vlan - type: vlan
mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }} mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
vlan_id: {{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }} vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
addresses: addresses:
- ip_netmask: {{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }} - ip_netmask: {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }} routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
{%- endfor %} {%- endfor %}

10
tripleo_ansible/roles/tripleo_network_config/templates/bonds_vlans/bonds_vlans_dpdk.j2
View File

@ -1,7 +1,7 @@
--- ---
{% set mtu_list = [ctlplane_mtu] %} {% set mtu_list = [ctlplane_mtu] %}
{% for network in role_networks %} {% for network in role_networks %}
{{ mtu_list.append(lookup('vars', role_networks_lower[network] ~ '_mtu')) }} {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
{%- endfor %} {%- endfor %}
{% set min_viable_mtu = mtu_list | max %} {% set min_viable_mtu = mtu_list | max %}
network_config: network_config:
@ -29,11 +29,11 @@ network_config:
{% for network in role_networks %} {% for network in role_networks %}
- type: vlan - type: vlan
device: bond_api device: bond_api
mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }} mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
vlan_id: {{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }} vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
addresses: addresses:
- ip_netmask: {{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }} - ip_netmask: {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }} routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
{%- endfor %} {%- endfor %}
{# Used as a provider network with external DHCP #} {# Used as a provider network with external DHCP #}
- type: ovs_user_bridge - type: ovs_user_bridge

10
tripleo_ansible/roles/tripleo_network_config/templates/bonds_vlans/bonds_vlans_storage.j2
View File

@ -1,7 +1,7 @@
--- ---
{% set mtu_list = [ctlplane_mtu] %} {% set mtu_list = [ctlplane_mtu] %}
{% for network in role_networks %} {% for network in role_networks %}
{{ mtu_list.append(lookup('vars', role_networks_lower[network] ~ '_mtu')) }} {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
{%- endfor %} {%- endfor %}
{% set min_viable_mtu = mtu_list | max %} {% set min_viable_mtu = mtu_list | max %}
network_config: network_config:
@ -31,9 +31,9 @@ network_config:
mtu: {{ min_viable_mtu }} mtu: {{ min_viable_mtu }}
{% for network in role_networks %} {% for network in role_networks %}
- type: vlan - type: vlan
mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }} mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
vlan_id: {{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }} vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
addresses: addresses:
- ip_netmask: {{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }} - ip_netmask: {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }} routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
{%- endfor %} {%- endfor %}

16
tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics/multiple_nics.j2
View File

@ -13,30 +13,30 @@ network_config:
{% if network not in ["External", "Tenant"] %} {% if network not in ["External", "Tenant"] %}
- type: interface - type: interface
name: nic{{ loop.index +1 }} name: nic{{ loop.index +1 }}
mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }} mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
use_dhcp: false use_dhcp: false
addresses: addresses:
- ip_netmask: - ip_netmask:
{{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }} {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }} routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
{% elif 'external_bridge' in role_tags %} {% elif 'external_bridge' in role_tags %}
- type: ovs_bridge - type: ovs_bridge
{% if network == 'External' %} {% if network == 'External' %}
name: {{ neutron_physical_bridge_name }} name: {{ neutron_physical_bridge_name }}
{% else %} {% else %}
name: {{ 'br-' ~ role_networks_lower[network] }} name: {{ 'br-' ~ networks_lower[network] }}
{% endif %} {% endif %}
mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }} mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
dns_servers: {{ ctlplane_dns_nameservers }} dns_servers: {{ ctlplane_dns_nameservers }}
use_dhcp: false use_dhcp: false
addresses: addresses:
- ip_netmask: - ip_netmask:
{{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }} {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }} routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
members: members:
- type: interface - type: interface
name: nic{{loop.index + 1}} name: nic{{loop.index + 1}}
mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }} mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
use_dhcp: false use_dhcp: false
primary: true primary: true
{% endif %} {% endif %}

16
tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics/multiple_nics_dpdk.j2
View File

@ -14,30 +14,30 @@ network_config:
{% if network not in ["External", "Tenant"] %} {% if network not in ["External", "Tenant"] %}
- type: interface - type: interface
name: nic{{ loop.index +1 }} name: nic{{ loop.index +1 }}
mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }} mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
use_dhcp: false use_dhcp: false
addresses: addresses:
- ip_netmask: - ip_netmask:
{{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }} {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }} routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
{% elif 'external_bridge' in role_tags %} {% elif 'external_bridge' in role_tags %}
- type: ovs_bridge - type: ovs_bridge
{% if network == 'External' %} {% if network == 'External' %}
name: {{ neutron_physical_bridge_name }} name: {{ neutron_physical_bridge_name }}
{% else %} {% else %}
name: {{ 'br-' ~ role_networks_lower[network] }} name: {{ 'br-' ~ networks_lower[network] }}
{% endif %} {% endif %}
mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }} mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
dns_servers: {{ ctlplane_dns_nameservers }} dns_servers: {{ ctlplane_dns_nameservers }}
use_dhcp: false use_dhcp: false
addresses: addresses:
- ip_netmask: - ip_netmask:
{{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }} {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }} routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
members: members:
- type: interface - type: interface
name: nic{{loop.index + 1}} name: nic{{loop.index + 1}}
mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }} mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
use_dhcp: false use_dhcp: false
primary: true primary: true
{% endif %} {% endif %}

24
tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics_vlans/multiple_nics_vlans.j2
View File

@ -13,38 +13,38 @@ network_config:
{% if network not in ["External", "Tenant"] %} {% if network not in ["External", "Tenant"] %}
- type: interface - type: interface
name: nic{{ loop.index + 1 }} name: nic{{ loop.index + 1 }}
mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }} mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
use_dhcp: false use_dhcp: false
- type: vlan - type: vlan
device: nic{{ loop.index + 1 }} device: nic{{ loop.index + 1 }}
mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }} mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
vlan_id: {{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }} vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
addresses: addresses:
- ip_netmask: - ip_netmask:
{{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }} {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }} routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
{% elif 'external_bridge' in role_tags %} {% elif 'external_bridge' in role_tags %}
- type: ovs_bridge - type: ovs_bridge
{% if network == 'External' %} {% if network == 'External' %}
name: {{ neutron_physical_bridge_name }} name: {{ neutron_physical_bridge_name }}
{% else %} {% else %}
name: {{ 'br-' ~ role_networks_lower[network] }} name: {{ 'br-' ~ networks_lower[network] }}
{% endif %} {% endif %}
mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }} mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
dns_servers: {{ ctlplane_dns_nameservers }} dns_servers: {{ ctlplane_dns_nameservers }}
use_dhcp: false use_dhcp: false
members: members:
- type: interface - type: interface
name: nic{{ loop.index + 1 }} name: nic{{ loop.index + 1 }}
mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }} mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
use_dhcp: false use_dhcp: false
primary: true primary: true
- type: vlan - type: vlan
mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }} mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
vlan_id: {{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }} vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
addresses: addresses:
- ip_netmask: - ip_netmask:
{{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }} {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }} routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
{% endif %} {% endif %}
{% endfor %} {% endfor %}

24
tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics_vlans/multiple_nics_vlans_dpdk.j2
View File

@ -14,39 +14,39 @@ network_config:
{% if network not in ["External", "Tenant"] %} {% if network not in ["External", "Tenant"] %}
- type: interface - type: interface
name: nic{{ loop.index + 1 }} name: nic{{ loop.index + 1 }}
mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }} mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
use_dhcp: false use_dhcp: false
- type: vlan - type: vlan
device: nic{{ loop.index + 1 }} device: nic{{ loop.index + 1 }}
mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }} mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
vlan_id: {{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }} vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
addresses: addresses:
- ip_netmask: - ip_netmask:
{{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }} {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }} routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
{% elif 'external_bridge' in role_tags %} {% elif 'external_bridge' in role_tags %}
- type: ovs_bridge - type: ovs_bridge
{% if network == 'External' %} {% if network == 'External' %}
name: {{ neutron_physical_bridge_name }} name: {{ neutron_physical_bridge_name }}
{% else %} {% else %}
name: {{ 'br-' ~ role_networks_lower[network] }} name: {{ 'br-' ~ networks_lower[network] }}
{% endif %} {% endif %}
mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }} mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
dns_servers: {{ ctlplane_dns_nameservers }} dns_servers: {{ ctlplane_dns_nameservers }}
use_dhcp: false use_dhcp: false
members: members:
- type: interface - type: interface
name: nic{{ loop.index + 1 }} name: nic{{ loop.index + 1 }}
mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }} mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
use_dhcp: false use_dhcp: false
primary: true primary: true
- type: vlan - type: vlan
mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }} mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
vlan_id: {{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }} vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
addresses: addresses:
- ip_netmask: - ip_netmask:
{{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }} {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }} routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
{% endif %} {% endif %}
{% set _ = nics_used.append(loop.index) %} {% set _ = nics_used.append(loop.index) %}
{% endfor %} {% endfor %}

10
tripleo_ansible/roles/tripleo_network_config/templates/single_nic_linux_bridge_vlans/single_nic_linux_bridge_vlans.j2
View File

@ -1,7 +1,7 @@
--- ---
{% set mtu_list = [ctlplane_mtu] %} {% set mtu_list = [ctlplane_mtu] %}
{% for network in role_networks %} {% for network in role_networks %}
{{ mtu_list.append(lookup('vars', role_networks_lower[network] ~ '_mtu')) }} {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
{%- endfor %} {%- endfor %}
{% set min_viable_mtu = mtu_list | max %} {% set min_viable_mtu = mtu_list | max %}
network_config: network_config:
@ -22,11 +22,11 @@ network_config:
primary: true primary: true
{% for network in role_networks if network not in networks_skip_config %} {% for network in role_networks if network not in networks_skip_config %}
- type: vlan - type: vlan
mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }} mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
vlan_id: {{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }} vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
device: {{ neutron_physical_bridge_name }} device: {{ neutron_physical_bridge_name }}
addresses: addresses:
- ip_netmask: - ip_netmask:
{{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }} {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }} routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
{% endfor %} {% endfor %}

10
tripleo_ansible/roles/tripleo_network_config/templates/single_nic_linux_bridge_vlans/single_nic_linux_bridge_vlans_storage.j2
View File

@ -1,7 +1,7 @@
--- ---
{% set mtu_list = [ctlplane_mtu] %} {% set mtu_list = [ctlplane_mtu] %}
{% for network in role_networks %} {% for network in role_networks %}
{{ mtu_list.append(lookup('vars', role_networks_lower[network] ~ '_mtu')) }} {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
{%- endfor %} {%- endfor %}
{% set min_viable_mtu = mtu_list | max %} {% set min_viable_mtu = mtu_list | max %}
network_config: network_config:
@ -22,11 +22,11 @@ network_config:
primary: true primary: true
{% for network in role_networks if network not in networks_skip_config) %} {% for network in role_networks if network not in networks_skip_config) %}
- type: vlan - type: vlan
mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }} mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
vlan_id: {{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }} vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
device: br-storage device: br-storage
addresses: addresses:
- ip_netmask: - ip_netmask:
{{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }} {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }} routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
{% endfor %} {% endfor %}

10
tripleo_ansible/roles/tripleo_network_config/templates/single_nic_vlans/controller_no_external.j2
View File

@ -1,7 +1,7 @@
--- ---
{% set mtu_list = [ctlplane_mtu] %} {% set mtu_list = [ctlplane_mtu] %}
{% for network in role_networks %} {% for network in role_networks %}
{{ mtu_list.append(lookup('vars', role_networks_lower[network] ~ '_mtu')) }} {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
{%- endfor %} {%- endfor %}
{% set min_viable_mtu = mtu_list | max %} {% set min_viable_mtu = mtu_list | max %}
network_config: network_config:
@ -22,10 +22,10 @@ network_config:
primary: true primary: true
{% for network in role_networks if network != 'External' %} {% for network in role_networks if network != 'External' %}
- type: vlan - type: vlan
mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }} mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
vlan_id: {{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }} vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
addresses: addresses:
- ip_netmask: - ip_netmask:
{{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }} {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }} routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
{% endfor %} {% endfor %}

10
tripleo_ansible/roles/tripleo_network_config/templates/single_nic_vlans/single_nic_vlans.j2
View File

@ -1,7 +1,7 @@
--- ---
{% set mtu_list = [ctlplane_mtu] %} {% set mtu_list = [ctlplane_mtu] %}
{% for network in role_networks %} {% for network in role_networks %}
{{ mtu_list.append(lookup('vars', role_networks_lower[network] ~ '_mtu')) }} {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
{%- endfor %} {%- endfor %}
{% set min_viable_mtu = mtu_list | max %} {% set min_viable_mtu = mtu_list | max %}
network_config: network_config:
@ -22,10 +22,10 @@ network_config:
primary: true primary: true
{% for network in role_networks %} {% for network in role_networks %}
- type: vlan - type: vlan
mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }} mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
vlan_id: {{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }} vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
addresses: addresses:
- ip_netmask: - ip_netmask:
{{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }} {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }} routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
{% endfor %} {% endfor %}

10
tripleo_ansible/roles/tripleo_network_config/templates/single_nic_vlans/single_nic_vlans_storage.j2
View File

@ -1,7 +1,7 @@
--- ---
{% set mtu_list = [ctlplane_mtu] %} {% set mtu_list = [ctlplane_mtu] %}
{% for network in role_networks %} {% for network in role_networks %}
{{ mtu_list.append(lookup('vars', role_networks_lower[network] ~ '_mtu')) }} {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
{%- endfor %} {%- endfor %}
{% set min_viable_mtu = mtu_list | max %} {% set min_viable_mtu = mtu_list | max %}
network_config: network_config:
@ -22,10 +22,10 @@ network_config:
primary: true primary: true
{% for network in role_networks %} {% for network in role_networks %}
- type: vlan - type: vlan
mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }} mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
vlan_id: {{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }} vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
addresses: addresses:
- ip_netmask: - ip_netmask:
{{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }} {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }} routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
{% endfor %} {% endfor %}