Merge "remove unused tunnel_bridge from all example configs"

etc/openstack_deploy/openstack_user_config.yml.aio

@@ -25,7 +25,6 @@ global_overrides:
   # The external IP is quoted simply to ensure that the .aio file can be used as input
   # dynamic inventory testing.
   external_lb_vip_address: "{{ bootstrap_host_public_address | default(ansible_default_ipv4.address) }}"
-  tunnel_bridge: "br-vxlan"
   management_bridge: "br-mgmt"
   provider_networks:
     - network:

etc/openstack_deploy/openstack_user_config.yml.aio.j2

@@ -33,7 +33,6 @@ global_overrides:
   # The external IP is quoted simply to ensure that the .aio file can be used as input
   # dynamic inventory testing.
   external_lb_vip_address: "{{ bootstrap_host_public_address | default(ansible_default_ipv4.address) }}"
-  tunnel_bridge: "br-vxlan"
   management_bridge: "br-mgmt"
   provider_networks:
     - network:

etc/openstack_deploy/openstack_user_config.yml.example

@@ -121,9 +121,6 @@
 #   Option: management_bridge (required, string)
 #   Name of management network bridge on target hosts. Typically 'br-mgmt'.
 #
-#   Option: tunnel_bridge (optional, string)
-#   Name of tunnel network bridge on target hosts. Typically 'br-vxlan'.
-#
 #   Level: provider_networks (required)
 #   List of container and bare metal networks on target hosts.
 #

etc/openstack_deploy/openstack_user_config.yml.pod.example

@@ -36,7 +36,6 @@ global_overrides:
   # endpoints the two addresses must be different.
   #
   external_lb_vip_address: openstack.example.com
-  tunnel_bridge: "br-vxlan"
   management_bridge: "br-mgmt"
   provider_networks:
     - network:

etc/openstack_deploy/openstack_user_config.yml.prod-ceph.example

@@ -20,7 +20,6 @@ global_overrides:
   # endpoints the two addresses must be different.
   #
   external_lb_vip_address: openstack.example.com
-  tunnel_bridge: "br-vxlan"
   management_bridge: "br-mgmt"
   provider_networks:
     - network:

etc/openstack_deploy/openstack_user_config.yml.prod.example

@@ -19,7 +19,6 @@ global_overrides:
   # endpoints the two addresses must be different.
   #
   external_lb_vip_address: openstack.example.com
-  tunnel_bridge: "br-vxlan"
   management_bridge: "br-mgmt"
   provider_networks:
     - network:

etc/openstack_deploy/openstack_user_config.yml.test.example

@@ -15,7 +15,6 @@ global_overrides:
   # do not need to be on separate networks.
   external_lb_vip_address: 172.29.236.10
   internal_lb_vip_address: 172.29.236.11
-  tunnel_bridge: "br-vxlan"
   management_bridge: "br-mgmt"
   provider_networks:
     - network: