Fix RedisVirtualIP when overrdiing InternalApi name_lower

When overriding RedisVirtualIP name_lower and using the
service_net_map_replace the overridden name_lower is was
not used in VipSubnetMapDefaults.

Get name_lower from the _service_nets jinja2 variable
which holds the replaced name_lower for the network when
service_net_map_replace is used.

Closes-Bug: #1832461
Change-Id: I839474dcce749fc3a75ae0e1be16780ddb83f5b3
This commit is contained in:
Harald Jensås 2019-06-12 10:44:36 +02:00
parent 49f16c09db
commit 2bd0012a6e
2 changed files with 9 additions and 1 deletions

View File

@ -124,7 +124,7 @@ parameters:
{%- for network in networks if network.vip|default(false) %}
{{network.name}}: {{network.name_lower}}_subnet
{%- endfor %}
redis: internal_api_subnet
redis: {{ _service_nets.get('internal_api', 'internal_api') }}_subnet
type: json
# We define mappings to work around names that break when doing the

View File

@ -0,0 +1,8 @@
---
fixes:
- |
When changeing the ``name_lower`` of the ``InternalApi`` network and using
the ``service_net_map_replace`` option in network data. The subnet
referenced in ``VipSubnetMapDefaults`` did not take in account the custom
lowercase name for the network, causing deployment error.
See bug: `1832461 <https://bugs.launchpad.net/tripleo/+bug/1832461>`_.