Skip to content

Commit 54e92e4

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #850 from fao89/nic-config-samples
Adding nic-config samples
2 parents f5bba4f + 738ca06 commit 54e92e4

15 files changed

+697
-0
lines changed

‎config/samples/nic-config-samples/bonds_vlans/bonds_vlans.j2‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
---
2+
{% set mtu_list = [ctlplane_mtu] %}
3+
{% for network in nodeset_networks %}
4+
{{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
5+
{%- endfor %}
6+
{% set min_viable_mtu = mtu_list | max %}
7+
network_config:
8+
- type: interface
9+
name: nic1
10+
mtu: {{ ctlplane_mtu }}
11+
use_dhcp: false
12+
addresses:
13+
- ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }}
14+
routes: {{ ctlplane_host_routes }}
15+
- type: ovs_bridge
16+
name: {{ neutron_physical_bridge_name }}
17+
dns_servers: {{ ctlplane_dns_nameservers }}
18+
domain: {{ dns_search_domains }}
19+
members:
20+
- type: ovs_bond
21+
name: bond1
22+
mtu: {{ min_viable_mtu }}
23+
ovs_options: {{ edpm_bond_interface_ovs_options }}
24+
members:
25+
- type: interface
26+
name: nic2
27+
mtu: {{ min_viable_mtu }}
28+
primary: true
29+
- type: interface
30+
name: nic3
31+
mtu: {{ min_viable_mtu }}
32+
{% for network in nodeset_networks %}
33+
- type: vlan
34+
mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
35+
vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
36+
addresses:
37+
- ip_netmask: {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
38+
routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
39+
{% endfor %}

‎config/samples/nic-config-samples/bonds_vlans/bonds_vlans_dpdk.j2‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
---
2+
{% set mtu_list = [ctlplane_mtu] %}
3+
{% for network in nodeset_networks %}
4+
{{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
5+
{%- endfor %}
6+
{% set min_viable_mtu = mtu_list | max %}
7+
network_config:
8+
- type: interface
9+
name: nic1
10+
mtu: {{ ctlplane_mtu }}
11+
use_dhcp: false
12+
addresses:
13+
- ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }}
14+
routes: {{ ctlplane_host_routes }}
15+
- type: linux_bond
16+
name: bond_api
17+
mtu: {{ min_viable_mtu }}
18+
bonding_options: {{ edpm_bond_interface_ovs_options }}
19+
use_dhcp: false
20+
dns_servers: {{ ctlplane_dns_nameservers }}
21+
members:
22+
- type: interface
23+
name: nic2
24+
mtu: {{ min_viable_mtu }}
25+
primary: true
26+
- type: interface
27+
name: nic3
28+
mtu: {{ min_viable_mtu }}
29+
{% for network in nodeset_networks %}
30+
- type: vlan
31+
device: bond_api
32+
mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
33+
vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
34+
addresses:
35+
- ip_netmask: {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
36+
routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
37+
{% endfor %}
38+
{# Used as a provider network with external DHCP #}
39+
- type: ovs_user_bridge
40+
name: br-dpdk0
41+
members:
42+
- type: ovs_dpdk_bond
43+
name: dpdkbond0
44+
rx_queue: {{ num_dpdk_interface_rx_queues }}
45+
members:
46+
- type: ovs_dpdk_port
47+
name: dpdk0
48+
members:
49+
- type: interface
50+
name: nic4
51+
- type: ovs_dpdk_port
52+
name: dpdk1
53+
members:
54+
- type: interface
55+
name: nic5

‎config/samples/nic-config-samples/bonds_vlans/bonds_vlans_storage.j2‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
---
2+
{% set mtu_list = [ctlplane_mtu] %}
3+
{% for network in nodeset_networks %}
4+
{{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
5+
{%- endfor %}
6+
{% set min_viable_mtu = mtu_list | max %}
7+
network_config:
8+
- type: interface
9+
name: nic1
10+
mtu: {{ ctlplane_mtu }}
11+
use_dhcp: false
12+
addresses:
13+
- ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }}
14+
routes: {{ ctlplane_host_routes }}
15+
- type: ovs_bridge
16+
name: br-bond
17+
dns_servers: {{ ctlplane_dns_nameservers }}
18+
domain: {{ dns_search_domains }}
19+
members:
20+
- type: ovs_bond
21+
name: bond1
22+
mtu: {{ min_viable_mtu }}
23+
ovs_options: {{ edpm_bond_interface_ovs_options }}
24+
members:
25+
- type: interface
26+
name: nic2
27+
mtu: {{ min_viable_mtu }}
28+
primary: true
29+
- type: interface
30+
name: nic3
31+
mtu: {{ min_viable_mtu }}
32+
{% for network in nodeset_networks %}
33+
- type: vlan
34+
mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
35+
vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
36+
addresses:
37+
- ip_netmask: {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
38+
routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
39+
{% endfor %}

‎config/samples/nic-config-samples/bonds_vlans/controller_no_external.j2‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
---
2+
{% set mtu_list = [ctlplane_mtu] %}
3+
{% for network in nodeset_networks %}
4+
{{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
5+
{%- endfor %}
6+
{% set min_viable_mtu = mtu_list | max %}
7+
network_config:
8+
- type: interface
9+
name: nic1
10+
mtu: {{ ctlplane_mtu }}
11+
use_dhcp: false
12+
addresses:
13+
- ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }}
14+
routes: {{ ctlplane_host_routes }}
15+
- type: ovs_bridge
16+
name: {{ neutron_physical_bridge_name }}
17+
dns_servers: {{ ctlplane_dns_nameservers }}
18+
domain: {{ dns_search_domains }}
19+
members:
20+
- type: ovs_bond
21+
name: bond1
22+
mtu: {{ min_viable_mtu }}
23+
ovs_options: {{ edpm_bond_interface_ovs_options }}
24+
members:
25+
- type: interface
26+
name: nic2
27+
mtu: {{ min_viable_mtu }}
28+
primary: true
29+
- type: interface
30+
name: nic3
31+
mtu: {{ min_viable_mtu }}
32+
{% for network in nodeset_networks if network != 'external' %}
33+
- type: vlan
34+
mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
35+
vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
36+
addresses:
37+
- ip_netmask: {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
38+
routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
39+
{% endfor %}

‎config/samples/nic-config-samples/multiple_nics/multiple_nics.j2‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
---
2+
network_config:
3+
- type: interface
4+
name: nic1
5+
mtu: {{ ctlplane_mtu }}
6+
dns_servers: {{ ctlplane_dns_nameservers }}
7+
domain: {{ dns_search_domains }}
8+
routes: {{ ctlplane_host_routes }}
9+
use_dhcp: false
10+
addresses:
11+
- ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }}
12+
{% for network in nodeset_networks %}
13+
{% if network not in ["external", "tenant"] %}
14+
- type: interface
15+
name: nic{{ loop.index +1 }}
16+
mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
17+
use_dhcp: false
18+
addresses:
19+
- ip_netmask:
20+
{{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
21+
routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
22+
{% elif 'external_bridge' in nodeset_tags|default([]) %}
23+
- type: ovs_bridge
24+
{% if network == 'external' %}
25+
name: {{ neutron_physical_bridge_name }}
26+
{% else %}
27+
name: {{ 'br-' ~ networks_lower[network] }}
28+
{% endif %}
29+
mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
30+
dns_servers: {{ ctlplane_dns_nameservers }}
31+
use_dhcp: false
32+
addresses:
33+
- ip_netmask:
34+
{{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
35+
routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
36+
members:
37+
- type: interface
38+
name: nic{{loop.index + 1}}
39+
mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
40+
use_dhcp: false
41+
primary: true
42+
{% endif %}
43+
{% endfor %}

‎config/samples/nic-config-samples/multiple_nics/multiple_nics_dpdk.j2‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
---
2+
network_config:
3+
- type: interface
4+
name: nic1
5+
mtu: {{ ctlplane_mtu }}
6+
dns_servers: {{ ctlplane_dns_nameservers }}
7+
domain: {{ dns_search_domains }}
8+
routes: {{ ctlplane_host_routes }}
9+
use_dhcp: false
10+
addresses:
11+
- ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }}
12+
{% set nics_used = [1] %}
13+
{% for network in nodeset_networks %}
14+
{% if network not in ["external", "tenant"] %}
15+
- type: interface
16+
name: nic{{ loop.index +1 }}
17+
mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
18+
use_dhcp: false
19+
addresses:
20+
- ip_netmask:
21+
{{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
22+
routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
23+
{% elif 'external_bridge' in nodeset_tags|default([]) %}
24+
- type: ovs_bridge
25+
{% if network == 'external' %}
26+
name: {{ neutron_physical_bridge_name }}
27+
{% else %}
28+
name: {{ 'br-' ~ networks_lower[network] }}
29+
{% endif %}
30+
mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
31+
dns_servers: {{ ctlplane_dns_nameservers }}
32+
use_dhcp: false
33+
addresses:
34+
- ip_netmask:
35+
{{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
36+
routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
37+
members:
38+
- type: interface
39+
name: nic{{loop.index + 1}}
40+
mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
41+
use_dhcp: false
42+
primary: true
43+
{% endif %}
44+
{% set _ = nics_used.append(loop.index) %}
45+
{% endfor %}
46+
- type: ovs_user_bridge
47+
name: br-dpdk0
48+
members:
49+
- type: ovs_dpdk_bond
50+
name: dpdkbond0
51+
rx_queue: {{ num_dpdk_interface_rx_queues }}
52+
members:
53+
- type: ovs_dpdk_port
54+
name: dpdk0
55+
members:
56+
- type: interface
57+
name: nic{{nics_used[-1] + 1}}
58+
- type: ovs_dpdk_port
59+
name: dpdk1
60+
members:
61+
- type: interface
62+
name: nic{{nics_used[-1] + 2}}

‎config/samples/nic-config-samples/multiple_nics/multiple_nics_dvr.j2‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
---
2+
network_config:
3+
- type: interface
4+
name: nic1
5+
mtu: {{ ctlplane_mtu }}
6+
dns_servers: {{ ctlplane_dns_nameservers }}
7+
domain: {{ dns_search_domains }}
8+
routes: {{ ctlplane_host_routes }}
9+
use_dhcp: false
10+
addresses:
11+
- ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }}
12+
{% for network in nodeset_networks %}
13+
{% if network == 'external' %}
14+
- type: ovs_bridge
15+
name: {{ neutron_physical_bridge_name }}
16+
mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
17+
dns_servers: {{ ctlplane_dns_nameservers }}
18+
use_dhcp: false
19+
{% else %}
20+
addresses:
21+
- ip_netmask:
22+
{{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
23+
routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
24+
{% endif %}
25+
members:
26+
- type: interface
27+
name: nic{{ loop.index +1 }}
28+
mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
29+
primary: true
30+
{% if network not in ["external", "tenant"] %}
31+
- type: interface
32+
name: nic{{ loop.index +1 }}
33+
mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
34+
use_dhcp: false
35+
addresses:
36+
- ip_netmask:
37+
{{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
38+
routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
39+
{% elif network == 'tenant' %}
40+
- type: ovs_bridge
41+
name: {{ 'br-' ~ networks_lower[network] }}
42+
mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
43+
dns_servers: {{ ctlplane_dns_nameservers }}
44+
use_dhcp: false
45+
addresses:
46+
- ip_netmask:
47+
{{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
48+
routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
49+
members:
50+
- type: interface
51+
name: nic{{loop.index + 1}}
52+
mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
53+
use_dhcp: false
54+
primary: true
55+
{% endif %}
56+
{% endfor %}

‎config/samples/nic-config-samples/multiple_nics_vlans/multiple_nics_vlans.j2‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
---
2+
network_config:
3+
- type: interface
4+
name: nic1
5+
mtu: {{ ctlplane_mtu }}
6+
dns_servers: {{ ctlplane_dns_nameservers }}
7+
domain: {{ dns_search_domains }}
8+
routes: {{ ctlplane_host_routes }}
9+
use_dhcp: false
10+
addresses:
11+
- ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }}
12+
{% for network in nodeset_networks %}
13+
{% if network not in ["external", "tenant"] %}
14+
- type: interface
15+
name: nic{{ loop.index + 1 }}
16+
mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
17+
use_dhcp: false
18+
- type: vlan
19+
device: nic{{ loop.index + 1 }}
20+
mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
21+
vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
22+
addresses:
23+
- ip_netmask:
24+
{{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
25+
routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
26+
{% elif 'external_bridge' in nodeset_tags|default([]) %}
27+
- type: ovs_bridge
28+
{% if network == 'external' %}
29+
name: {{ neutron_physical_bridge_name }}
30+
{% else %}
31+
name: {{ 'br-' ~ networks_lower[network] }}
32+
{% endif %}
33+
mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
34+
dns_servers: {{ ctlplane_dns_nameservers }}
35+
use_dhcp: false
36+
members:
37+
- type: interface
38+
name: nic{{ loop.index + 1 }}
39+
mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
40+
use_dhcp: false
41+
primary: true
42+
- type: vlan
43+
mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
44+
vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
45+
addresses:
46+
- ip_netmask:
47+
{{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
48+
routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
49+
{% endif %}
50+
{% endfor %}

0 commit comments

Comments
 (0)