openstack/openstack-ansible
Code Issues Proposed changes

Always use physnet1 as external network name in AIO and examples

Browse Source 
Previously this was either 'vlan' or 'flat' depending on the external
network type, and there were also cases when the name and type were
mismatched - particularly when the flat network was untagged traffic
on a vlan bridge.

This patch removes that confusion and always names the external
network 'physnet1' to align with the upstream neutron examples.

Change-Id: I3cd8b93b42777b787552051bcdc9a90347f1e03d
This commit is contained in:
Jonathan Rosser 2024-02-12 10:17:54 +00:00
parent fca293037e
commit 563159f49c
9 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/openstack_deploy/openstack_user_config.yml.aio
View File

@ -97,7 +97,7 @@ global_overrides:
container_interface: "eth12" container_interface: "eth12"
host_bind_override: "eth12" host_bind_override: "eth12"
type: "flat" type: "flat"
net_name: "flat" net_name: "physnet1"
group_binds: group_binds:
- neutron_linuxbridge_agent - neutron_linuxbridge_agent
- network: - network:
@ -106,7 +106,7 @@ global_overrides:
container_interface: "eth11" container_interface: "eth11"
type: "vlan" type: "vlan"
range: "101:200,301:400" range: "101:200,301:400"
net_name: "vlan" net_name: "physnet1"
group_binds: group_binds:
- neutron_linuxbridge_agent - neutron_linuxbridge_agent
- network: - network:

12
etc/openstack_deploy/openstack_user_config.yml.aio.j2
View File

@ -145,13 +145,13 @@ global_overrides:
network_interface: "eth12" network_interface: "eth12"
type: "vlan" type: "vlan"
range: "101:200,301:400" range: "101:200,301:400"
net_name: "vlan" net_name: "physnet1"
group_binds: group_binds:
- neutron_openvswitch_agent - neutron_openvswitch_agent
- network: - network:
container_bridge: "br-provider" container_bridge: "br-provider"
container_type: "veth" container_type: "veth"
net_name: "vlan" net_name: "physnet1"
type: "flat" type: "flat"
group_binds: group_binds:
- neutron_openvswitch_agent - neutron_openvswitch_agent
@ -162,7 +162,7 @@ global_overrides:
container_interface: "eth12" container_interface: "eth12"
host_bind_override: "eth12" host_bind_override: "eth12"
type: "flat" type: "flat"
net_name: "flat" net_name: "physnet1"
group_binds: group_binds:
- neutron_linuxbridge_agent - neutron_linuxbridge_agent
- network: - network:
@ -171,7 +171,7 @@ global_overrides:
container_interface: "eth11" container_interface: "eth11"
type: "vlan" type: "vlan"
range: "101:200,301:400" range: "101:200,301:400"
net_name: "vlan" net_name: "physnet1"
group_binds: group_binds:
- neutron_linuxbridge_agent - neutron_linuxbridge_agent
{% else %} {% else %}
@ -180,13 +180,13 @@ global_overrides:
network_interface: "eth12" network_interface: "eth12"
type: "vlan" type: "vlan"
range: "101:200,301:400" range: "101:200,301:400"
net_name: "vlan" net_name: "physnet1"
group_binds: group_binds:
- neutron_ovn_gateway - neutron_ovn_gateway
- network: - network:
container_bridge: "br-provider" container_bridge: "br-provider"
container_type: "veth" container_type: "veth"
net_name: "vlan" net_name: "physnet1"
type: "flat" type: "flat"
group_binds: group_binds:
- neutron_ovn_gateway - neutron_ovn_gateway

4
etc/openstack_deploy/openstack_user_config.yml.example
View File

@ -286,7 +286,7 @@
# container_interface: "eth11" # container_interface: "eth11"
# type: "vlan" # type: "vlan"
# range: "101:200,301:400" # range: "101:200,301:400"
# net_name: "vlan" # net_name: "physnet1"
# - network: # - network:
# group_binds: # group_binds:
# - neutron_linuxbridge_agent # - neutron_linuxbridge_agent
@ -295,7 +295,7 @@
# container_interface: "eth12" # container_interface: "eth12"
# host_bind_override: "eth12" # host_bind_override: "eth12"
# type: "flat" # type: "flat"
# net_name: "flat" # net_name: "physnet1"
# #
# -------- # --------
# #

4
etc/openstack_deploy/openstack_user_config.yml.pod.example
View File

@ -181,7 +181,7 @@ global_overrides:
container_interface: "eth12" container_interface: "eth12"
host_bind_override: "eth12" host_bind_override: "eth12"
type: "flat" type: "flat"
net_name: "flat" net_name: "physnet1"
group_binds: group_binds:
- neutron_linuxbridge_agent - neutron_linuxbridge_agent
- network: - network:
@ -190,7 +190,7 @@ global_overrides:
container_interface: "eth11" container_interface: "eth11"
type: "vlan" type: "vlan"
range: "101:200,301:400" range: "101:200,301:400"
net_name: "vlan" net_name: "physnet1"
group_binds: group_binds:
- neutron_linuxbridge_agent - neutron_linuxbridge_agent
- network: - network:

4
etc/openstack_deploy/openstack_user_config.yml.prod-ceph.example
View File

@ -48,7 +48,7 @@ global_overrides:
container_interface: "eth12" container_interface: "eth12"
host_bind_override: "eth12" host_bind_override: "eth12"
type: "flat" type: "flat"
net_name: "flat" net_name: "physnet1"
group_binds: group_binds:
- neutron_linuxbridge_agent - neutron_linuxbridge_agent
- network: - network:
@ -57,7 +57,7 @@ global_overrides:
container_interface: "eth11" container_interface: "eth11"
type: "vlan" type: "vlan"
range: "101:200,301:400" range: "101:200,301:400"
net_name: "vlan" net_name: "physnet1"
group_binds: group_binds:
- neutron_linuxbridge_agent - neutron_linuxbridge_agent
- network: - network:

4
etc/openstack_deploy/openstack_user_config.yml.prod.example
View File

@ -47,7 +47,7 @@ global_overrides:
container_interface: "eth12" container_interface: "eth12"
host_bind_override: "eth12" host_bind_override: "eth12"
type: "flat" type: "flat"
net_name: "flat" net_name: "physnet1"
group_binds: group_binds:
- neutron_linuxbridge_agent - neutron_linuxbridge_agent
- network: - network:
@ -56,7 +56,7 @@ global_overrides:
container_interface: "eth11" container_interface: "eth11"
type: "vlan" type: "vlan"
range: "101:200,301:400" range: "101:200,301:400"
net_name: "vlan" net_name: "physnet1"
group_binds: group_binds:
- neutron_linuxbridge_agent - neutron_linuxbridge_agent
- network: - network:

4
etc/openstack_deploy/openstack_user_config.yml.test.example
View File

@ -43,7 +43,7 @@ global_overrides:
container_interface: "eth12" container_interface: "eth12"
host_bind_override: "eth12" host_bind_override: "eth12"
type: "flat" type: "flat"
net_name: "flat" net_name: "physnet1"
group_binds: group_binds:
- neutron_linuxbridge_agent - neutron_linuxbridge_agent
- network: - network:
@ -52,7 +52,7 @@ global_overrides:
container_interface: "eth11" container_interface: "eth11"
type: "vlan" type: "vlan"
range: "101:200,301:400" range: "101:200,301:400"
net_name: "vlan" net_name: "physnet1"
group_binds: group_binds:
- neutron_linuxbridge_agent - neutron_linuxbridge_agent
- network: - network:

2
playbooks/defaults/healthchecks-vars.yml
View File

@ -34,7 +34,7 @@ public_dns_servers:
neutron_networks: neutron_networks:
public: public:
name: "{{ tempest_public_net_name | default('public') }}" name: "{{ tempest_public_net_name | default('physnet1') }}"
shared: True shared: True
external: True external: True
pn_type: "{{ tempest_public_net_provider_type | default('flat') }}" pn_type: "{{ tempest_public_net_provider_type | default('flat') }}"

6
tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
View File

@ -33,11 +33,7 @@ tempest_private_net_provider_type: geneve
{% else %} {% else %}
tempest_private_net_provider_type: vxlan tempest_private_net_provider_type: vxlan
{% endif %} {% endif %}
{% if _neutron_plugin_driver == 'ml2.lxb' %} tempest_public_net_physical_name: 'physnet1'
tempest_public_net_physical_name: flat
{% else %}
tempest_public_net_physical_name: vlan
{% endif %}
# systemd-journald limitations # systemd-journald limitations
openstack_hosts_journald_config: openstack_hosts_journald_config: