openstack
/
openstack-ansible
Code Issues Proposed changes

Merge "Always use physnet1 as external network name in AIO and examples"

This commit is contained in:
Zuul 2024-03-08 17:40:53 +00:00 committed by Gerrit Code Review
parent 55574b4a87 563159f49c
commit 500d4c3ce4
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"
host_bind_override: "eth12"
type: "flat"
net_name: "flat"
net_name: "physnet1"
group_binds:
- neutron_linuxbridge_agent
- network:
@ -106,7 +106,7 @@ global_overrides:
container_interface: "eth11"
type: "vlan"
range: "101:200,301:400"
net_name: "vlan"
net_name: "physnet1"
group_binds:
- neutron_linuxbridge_agent
- network:

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

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

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

@ -286,7 +286,7 @@
# container_interface: "eth11"
# type: "vlan"
# range: "101:200,301:400"
# net_name: "vlan"
# net_name: "physnet1"
# - network:
# group_binds:
# - neutron_linuxbridge_agent
@ -295,7 +295,7 @@
# container_interface: "eth12"
# host_bind_override: "eth12"
# 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"
host_bind_override: "eth12"
type: "flat"
net_name: "flat"
net_name: "physnet1"
group_binds:
- neutron_linuxbridge_agent
- network:
@ -190,7 +190,7 @@ global_overrides:
container_interface: "eth11"
type: "vlan"
range: "101:200,301:400"
net_name: "vlan"
net_name: "physnet1"
group_binds:
- neutron_linuxbridge_agent
- network:

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

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

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

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

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

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

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

@ -34,7 +34,7 @@ public_dns_servers:
neutron_networks:
public:
name: "{{ tempest_public_net_name | default('public') }}"
name: "{{ tempest_public_net_name | default('physnet1') }}"
shared: True
external: True
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 %}
tempest_private_net_provider_type: vxlan
{% endif %}
{% if _neutron_plugin_driver == 'ml2.lxb' %}
tempest_public_net_physical_name: flat
{% else %}
tempest_public_net_physical_name: vlan
{% endif %}
tempest_public_net_physical_name: 'physnet1'
# systemd-journald limitations
openstack_hosts_journald_config: