openstack
/
tripleo-ansible
Code Issues Proposed changes

Adds more nic config templates[1] 

This adds some more nic config templates and corrects the
var used for interface_name in standalone.j2/undercloud.j2

Change-Id: Iac2d4a968bd15f71f83759acde3b4b7b9c3853f4
This commit is contained in:
Rabi Mishra 2020-09-24 10:46:08 +05:30
parent d37dfddff3
commit a8e022ae7c
8 changed files with 100 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tripleo_ansible/roles/tripleo_network_config/templates/net_config_bond.j2 Normal file
View File

@ -0,0 +1,17 @@
---
network_config:
- type: ovs_bridge
name: {{ neutron_physical_bridge_name }}
use_dhcp: true
dns_servers: {{ ctlplane_dns_nameservers }}
domain: {{ dns_search_domains }}
members:
- type: ovs_bond
name: bond1
use_dhcp: true
ovs_options: {{ bond_interface_ovs_options }}
members:
- type: interface
name: nic1
- type: interface
name: nic2

12
tripleo_ansible/roles/tripleo_network_config/templates/net_config_bridge.j2 Normal file
View File

@ -0,0 +1,12 @@
---
network_config:
- type: ovs_bridge
name: {{ neutron_physical_bridge_name }}
use_dhcp: true
dns_servers: {{ ctlplane_dns_nameservers }}
domain: {{ dns_search_domains }}
members:
- type: interface
name: {{ neutron_public_interface_name }}
# force the MAC address of the bridge to this interface
primary: true

17
tripleo_ansible/roles/tripleo_network_config/templates/net_config_linux_bridge.j2 Normal file
View File

@ -0,0 +1,17 @@
---
network_config:
- type: linux_bridge
name: {{ neutron_physical_bridge_name }}
addresses:
- ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_subnet_cidr }}
dns_servers: {{ ctlplane_dns_nameservers }}
domain: {{ dns_search_domains }}
members:
- type: interface
name: {{ neutron_public_interface_name }}
# force the MAC address of the bridge to this interface
primary: true
routes:
- ip_netmask: 0.0.0.0/0
next_hop: {{ ctlplane_gateway_ip }}
default: true

12
tripleo_ansible/roles/tripleo_network_config/templates/net_config_static.j2 Normal file
View File

@ -0,0 +1,12 @@
---
network_config:
- type: interface
name: {{ neutron_public_interface_name }}
use_dhcp: false
dns_servers: {{ ctlplane_dns_nameservers }}
domain: {{ dns_search_domains }}
addresses:
- ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_subnet_cidr }}
routes:
- default: true
next_hop: {{ ctlplane_gateway_ip }}

17
tripleo_ansible/roles/tripleo_network_config/templates/net_config_static_bridge.j2 Normal file
View File

@ -0,0 +1,17 @@
---
network_config:
- type: ovs_bridge
name: {{ neutron_physical_bridge_name }}
use_dhcp: false
dns_servers: {{ ctlplane_dns_nameservers }}
domain: {{ dns_search_domains }}
addresses:
- ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_subnet_cidr }}
routes:
- default: true
next_hop: {{ ctlplane_gateway_ip }}
members:
- type: interface
name: {{ neutron_public_interface_name }}
# force the MAC address of the bridge to this interface
primary: true

19
tripleo_ansible/roles/tripleo_network_config/templates/net_config_static_bridge_with_external_dhcp.j2 Normal file
View File

@ -0,0 +1,19 @@
---
network_config:
- type: ovs_bridge
name: {{ neutron_physical_bridge_name }}
use_dhcp: true
dns_servers: {{ ctlplane_dns_nameservers }}
domain: {{ dns_search_domains }}
members:
- type: interface
name: {{ neutron_public_interface_name }}
# force the MAC address of the bridge to this interface
primary: true
- type: interface
name: br-ex:0
addresses:
- ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_subnet_cidr }}
routes:
- default: true
next_hop: {{ ctlplane_gateway_ip }}

6
tripleo_ansible/roles/tripleo_network_config/templates/standalone.j2
View File

@ -22,11 +22,11 @@ network_config:
- ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_subnet_cidr }}
- ip_netmask: {{ control_virtual_ip}}/{{ control_virtual_cidr }}
- ip_netmask: {{ public_virtual_ip}}/{{ public_virtual_cidr }}
routes: {{ ctlplane_static_routes }}
dns_servers: {{ dns_nameservers }}
routes: {{ ctlplane_host_routes }}
dns_servers: {{ ctlplane_dns_nameservers }}
domain: {{ dns_search_domains }}
members:
- type: interface
name: {{ neutron_public_interface }}
name: {{ neutron_public_interface_name }}
primary: true
mtu: {{ local_mtu }}

6
tripleo_ansible/roles/tripleo_network_config/templates/undercloud.j2
View File

@ -21,11 +21,11 @@ network_config:
- ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_subnet_cidr }}
- ip_netmask: {{ control_virtual_ip}}/{{ control_virtual_cidr }}
- ip_netmask: {{ public_virtual_ip}}/{{ public_virtual_cidr }}
routes: {{ ctlplane_static_routes }}
dns_servers: {{ dns_nameservers }}
routes: {{ ctlplane_host_routes }}
dns_servers: {{ ctlplane_dns_nameservers }}
domain: {{ dns_search_domains }}
members:
- type: interface
name: {{ neutron_public_interface }}
name: {{ neutron_public_interface_name }}
primary: true
mtu: {{ local_mtu }}