Add ipv4 undercloud_external_network when the overcloud is ipv6

Not all envs allow for ipv6 routing. This review adds an
ipv4 option, undercloud_external_network_ipv4, to be used
for routing/masquerade when undercloud_external_network
would return an ipv6 value.

This value is only referenced in
https://review.openstack.org/#/c/642924.
When ipv6 is not used, the undercloud_external_network_ipv4
value is never used.

Change-Id: I518bd9973bfd82350f75d2d1b2f444a5fb510a82
This commit is contained in:
Ronelle Landy 2019-03-13 14:57:30 -04:00
parent dd894a42d7
commit 61019d6388

View File

@ -153,6 +153,9 @@ networks:
undercloud_network_cidr: 192.168.24.0/24
undercloud_external_network_cidr: >-
{%- if overcloud_ipv6|bool %}2001:db8:fd00:1000::/64{% else %}10.0.0.1/24{% endif -%}
# undercloud_external_network_cidr_ipv4 is only used for routing when
# the overcloud is ipv6
undercloud_external_network_cidr_ipv4: 10.0.0.1/24
undercloud_networks:
external:
address: "{{ undercloud_external_network_cidr|nthhost(1) }}"