openstack/openstack-ansible
Code Issues Proposed changes

Merge "remove unused tunnel_bridge from all example configs"

Browse Source
This commit is contained in:
Zuul 2018-04-12 18:11:51 +00:00 committed by Gerrit Code Review
commit b58c027b4b
7 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@ -121,9 +121,6 @@
# Option: management_bridge (required, string) # Option: management_bridge (required, string)
# Name of management network bridge on target hosts. Typically 'br-mgmt'. # 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) # Level: provider_networks (required)
# List of container and bare metal networks on target hosts. # List of container and bare metal networks on target hosts.
# #

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

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

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

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

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

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

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

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