Hardcoded network names in overcloud-resource-registry-puppet.j2.yaml break custom network name support

[Cédric Jeanneret]

There are a couple of conditions using hardcoded network names that will just break in case of custom network names:
https://opendev.org/openstack/tripleo-heat-templates/src/branch/master/overcloud-resource-registry-puppet.j2.yaml#L430-L448

We need to be smarter...

[Cédric Jeanneret (cjeanner)]

Trying with a simple "remove nested "if"" and I end up with this:

    ComputeHostnameResolveNetwork: internal_api_cloud_0
    ControllerHostnameResolveNetwork: internal_api_cloud_0
    CephStorageHostnameResolveNetwork: storage_cloud_0

This sounds far, far better.

[Rabi Mishra (rabi)]

Network names are always fixed. Not sure what's the issue you've.

If you've network data as below

...

- name: InternalApi
  vip: true
  name_lower: internal_api_cloud_0
  service_net_map_replace: internal_api
  subnets:
    internal_api_cloud_0_subnet:
      ip_subnet: '172.16.13.0/24'
      allocation_pools: [{'start': '172.16.13.4', 'end': '172.16.13.250'}]
      vlan: 13

...

Then

  {%- if 'InternalApi' in role.networks %}
    {{role.name}}HostnameResolveNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
    {{role.name}}MetricsQdrNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
  {%- else %}
    {{role.name}}HostnameResolveNetwork: ctlplane
    {{role.name}}MetricsQdrNetwork: ctlplane
  {%- endif %}

would return

{{role.name}}HostnameResolveNetwork: internal_api_cloud_0
{{role.name}}MetricsQdrNetwork: internal_api_cloud_0

[Cédric Jeanneret (cjeanner)]

Nope. You can customize them:

- name: StorageCloud0
  mtu: 1350
  vip: true
  name_lower: storage_cloud_0
  service_net_map_replace: storage
  subnets:
    storage_cloud_0_subnet:
      ip_subnet: '172.16.11.0/24'
      allocation_pools: [{'start': '172.16.11.4', 'end': '172.16.11.250'}]
      vlan: 11

For instance..... So nope. they aren't "fixed".

[Rabi Mishra (rabi)]

As mentioned on the irc for additional overclouds[1] the 'name' in network data would remain the same. 'name_lower' is the one which would change and AFAIK that's used everywhere.

[1] https://docs.openstack.org/project-deploy-guide/tripleo-docs/latest/features/multiple_overclouds.html#deploying-additional-overclouds

[Rabi Mishra (rabi)]

https://opendev.org/openstack/tripleo-heat-templates/src/branch/master/overcloud-resource-registry-puppet.j2.yaml#L3-L6 would correctly set '_service_nets' used in ServiceNetMap.

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: master
Review: https://review.opendev.org/c/openstack/tripleo-ansible/+/813166

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: master
Review: https://review.opendev.org/c/openstack/tripleo-ansible/+/813167

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: master
Review: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/813168

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: master
Review: https://review.opendev.org/c/openstack/tripleo-ansible/+/813169

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: master
Review: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/813175

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: master
Review: https://review.opendev.org/c/openstack/tripleo-ansible/+/813177

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: master
Review: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/813184

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: master
Review: https://review.opendev.org/c/openstack/tripleo-ansible/+/813192

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: master
Review: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/813194

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/813168
Committed: https://opendev.org/openstack/tripleo-heat-templates/commit/28161b58682ac6d4e86b49ccf01395e40ffd613b
Submitter: "Zuul (22348)"
Branch: master

commit 28161b58682ac6d4e86b49ccf01395e40ffd613b
Author: Harald Jensås <email address hidden>
Date: Fri Oct 8 13:21:04 2021 +0200

    Default CephDashboardNetwork to storage_dashboard

    The default CephDashboardNetwork in ServiceNetMap was
    'ctlplane'. Change this to default to storage_dashboard
    with a fallback to 'ctlplane'.

    This will allow us to remove the hard-coded conditionals
    on 'StorageDashboard' network name in tripleo_hiera_data.

    Related-Bug: #1946239
    Change-Id: I9a62b2cf24b2dd020de74e18af8c7bc0535d12d9

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/813175
Committed: https://opendev.org/openstack/tripleo-heat-templates/commit/3cf046ccee8e2c90a9b03fd6bb32865016fa8a24
Submitter: "Zuul (22348)"
Branch: master

commit 3cf046ccee8e2c90a9b03fd6bb32865016fa8a24
Author: Harald Jensås <email address hidden>
Date: Fri Oct 8 13:29:08 2021 +0200

    Add InternalApiNetwork entry in ServiceNetMap

    This is not explicitly mapping to a network to a service,
    but we already have other entries like ResolveNetwork and
    PublicNetwork in the ServiceNetMap.

    Adding InternalApiNetwork to the ServiceNetMap will allow us
    to remove a conditional on hard-coded network name in
    tripleo_hieradata.

    It also makes it possible to change the network for interal_api_vip
    via the ServiceNetMap or the service_net_map_replace in network
    data.

    Related-Bug: #1946239
    Change-Id: I1dcd9da59487bfa0842c5f131a0e9a9d9d0c676d

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-ansible/+/813166
Committed: https://opendev.org/openstack/tripleo-ansible/commit/32f1ac14359e8d629ffb2a56397e3a574ccd8765
Submitter: "Zuul (22348)"
Branch: master

commit 32f1ac14359e8d629ffb2a56397e3a574ccd8765
Author: Harald Jensås <email address hidden>
Date: Fri Oct 8 13:01:17 2021 +0200

    Use service_net_map, not conditions on hard-coded networ names

    The ServiceNetMap defines the PublicNetwork, it defaults to
    'external' and fall's back to ctlplane. Let's use the ServiceNetMap
    when setting public_virtual_ip, tripleo::haproxy::public_virtual_ip
    and tripleo::keepalived::public_virtual_ip.

    This removes the conditionals on hard-coded network.name 'External'
    in vip_data.j2. This will allow custom network names to be used,
    either via overriding PublicNetwork in ServiceNetMap or using the
    service_net_map_replace in network data.

    Related-Bug: #1946239
    Change-Id: I6f159d0b117233ba655bbb348a578ae071dd1103

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/813184
Committed: https://opendev.org/openstack/tripleo-heat-templates/commit/c0b778301fff8f069c662f382b1e93806e876bee
Submitter: "Zuul (22348)"
Branch: master

commit c0b778301fff8f069c662f382b1e93806e876bee
Author: Harald Jensås <email address hidden>
Date: Fri Oct 8 14:47:23 2021 +0200

    GaneshaNetwork - fallback -> external -> ctlplane

    The GaneshaNetwork attempted to fallback to the external
    network in the case when storage_nfs network does not
    exists. It should also fallback to ctlplane in the case that
    the external network does not exist.

    Related-Bug: #1946239
    Change-Id: I5804621a3081209bbae63193c1e09601826f4275

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-ansible/+/813167
Committed: https://opendev.org/openstack/tripleo-ansible/commit/2894ef9d3e4208ee967b8eed8ccc7bef268414cd
Submitter: "Zuul (22348)"
Branch: master

commit 2894ef9d3e4208ee967b8eed8ccc7bef268414cd
Author: Harald Jensås <email address hidden>
Date: Fri Oct 8 13:13:22 2021 +0200

    Use service_net_map for ganesha_vip

    Instead of if conditionals on hard-coded network names, use the
    ServiceNetMap. GaneshaNetwork defaults to 'storage_nfs' with a
    fallback to 'external' and then to 'ctlplane' in the ServiceNetMap.

    This will allow custom network names to be used,
    either via overriding GaneshaNetwork in ServiceNetMap or using the
    service_net_map_replace in network data.

    Related-Bug: #1946239
    Depends-On: I5804621a3081209bbae63193c1e09601826f4275
    Change-Id: Ic7743e7cd640703d166aecd97f59cbaf11c65500

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-ansible/+/813169
Committed: https://opendev.org/openstack/tripleo-ansible/commit/3af34f0c68383ff733039f075fe7728baf0f888f
Submitter: "Zuul (22348)"
Branch: master

commit 3af34f0c68383ff733039f075fe7728baf0f888f
Author: Harald Jensås <email address hidden>
Date: Fri Oct 8 13:17:38 2021 +0200

    Use service_net_map for ceph_dashboard_vip

    Instead of if conditionals on hard-coded network names, use the
    ServiceNetMap. CephDashboardNetwork defaults to storage_dashboard
    with a fallback to 'ctlplane' in the ServiceNetMap.

    This will allow custom network names to be used, via overriding
    CephDashboardNetwork in ServiceNetMap or via service_net_map_replace
    in network data.

    Related-Bug: #1946239
    Depends-On: I9a62b2cf24b2dd020de74e18af8c7bc0535d12d9
    Change-Id: I145d6c0ddd3cbbfed92113db56e22299ab7c9b08

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-ansible/+/813177
Committed: https://opendev.org/openstack/tripleo-ansible/commit/abbfc7f2aa119caff021944a78bd7b6fd6c97152
Submitter: "Zuul (22348)"
Branch: master

commit abbfc7f2aa119caff021944a78bd7b6fd6c97152
Author: Harald Jensås <email address hidden>
Date: Fri Oct 8 13:52:53 2021 +0200

    Use service_net_map for internal_api_vip

    Use the internal_api_network entry in service_net_map for
    internal_api_virtual_ip instead of conditions on hard-coded
    network name 'InternalApi'.

    Also clean up indentation for public_virtual_ip.

    Related-Bug: #1946239
    Depends-On: I1dcd9da59487bfa0842c5f131a0e9a9d9d0c676d
    Change-Id: Iaba927739f82253809b1f0a1c96b9ac98a005ed6

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-ansible/+/813192
Committed: https://opendev.org/openstack/tripleo-ansible/commit/362a54363f6b6b9beb923588ffbb94f3fa140e6f
Submitter: "Zuul (22348)"
Branch: master

commit 362a54363f6b6b9beb923588ffbb94f3fa140e6f
Author: Harald Jensås <email address hidden>
Date: Fri Oct 8 14:49:49 2021 +0200

    Filter network_virtual_ips using service_net_map

    Instead of filtering on hard-coded network names in
    THT/common/deploy-steps.j2:415 filter on the service_net_map
    in tripleo_hieradata.

    This allows us to remove the conditions based on hard-coded
    network names in: THT/common/deploy-steps.j2:415

    Related-Bug: #1946239
    Change-Id: I9c5d681c266db1e5048a1be6557c20abd5a07f7b

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/813194
Committed: https://opendev.org/openstack/tripleo-heat-templates/commit/9e30f281fba7f108ad1eff37b721d2b1ac9a2cc9
Submitter: "Zuul (22348)"
Branch: master

commit 9e30f281fba7f108ad1eff37b721d2b1ac9a2cc9
Author: Harald Jensås <email address hidden>
Date: Fri Oct 8 15:44:51 2021 +0200

    Remove network_virtual_ips hard-coded name filter

    Remove the filtering of network_virtual_ips based on
    the hard-coded network names. The depends-on does similar
    filtering by using the service_net_map instead.

    This should allow better support for custom network names,
    custom ServiceNetMap and use of service_net_map_replace in
    network data.

    Related-Bug: #1946239
    Depends-On: I9c5d681c266db1e5048a1be6557c20abd5a07f7b
    Change-Id: I1c904d2f09e4679e50713d344abdff4fd830132a

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/wallaby
Review: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/815197

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/wallaby
Review: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/815198

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/wallaby
Review: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/815199

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/wallaby
Review: https://review.opendev.org/c/openstack/tripleo-ansible/+/815200

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/wallaby
Review: https://review.opendev.org/c/openstack/tripleo-ansible/+/815201

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/wallaby
Review: https://review.opendev.org/c/openstack/tripleo-ansible/+/815202

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/wallaby
Review: https://review.opendev.org/c/openstack/tripleo-ansible/+/815203

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/wallaby
Review: https://review.opendev.org/c/openstack/tripleo-ansible/+/815204

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/wallaby
Review: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/814946

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/815198
Committed: https://opendev.org/openstack/tripleo-heat-templates/commit/03761ab7a33272d33d0bc650a8edd4bbd818cb04
Submitter: "Zuul (22348)"
Branch: stable/wallaby

commit 03761ab7a33272d33d0bc650a8edd4bbd818cb04
Author: Harald Jensås <email address hidden>
Date: Fri Oct 8 13:29:08 2021 +0200

    Add InternalApiNetwork entry in ServiceNetMap

    This is not explicitly mapping to a network to a service,
    but we already have other entries like ResolveNetwork and
    PublicNetwork in the ServiceNetMap.

    Adding InternalApiNetwork to the ServiceNetMap will allow us
    to remove a conditional on hard-coded network name in
    tripleo_hieradata.

    It also makes it possible to change the network for interal_api_vip
    via the ServiceNetMap or the service_net_map_replace in network
    data.

    Conflicts:
      overcloud-resource-registry-puppet.j2.yaml

    Related-Bug: #1946239
    Change-Id: I1dcd9da59487bfa0842c5f131a0e9a9d9d0c676d
    (cherry picked from commit 3cf046ccee8e2c90a9b03fd6bb32865016fa8a24)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/815199
Committed: https://opendev.org/openstack/tripleo-heat-templates/commit/b1c7478e06a1990c8def9183fb6e0fecc696f7f3
Submitter: "Zuul (22348)"
Branch: stable/wallaby

commit b1c7478e06a1990c8def9183fb6e0fecc696f7f3
Author: Harald Jensås <email address hidden>
Date: Fri Oct 8 14:47:23 2021 +0200

    GaneshaNetwork - fallback -> external -> ctlplane

    The GaneshaNetwork attempted to fallback to the external
    network in the case when storage_nfs network does not
    exists. It should also fallback to ctlplane in the case that
    the external network does not exist.

    Conflicts:
      overcloud-resource-registry-puppet.j2.yaml

    Related-Bug: #1946239
    Change-Id: I5804621a3081209bbae63193c1e09601826f4275
    (cherry picked from commit c0b778301fff8f069c662f382b1e93806e876bee)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-ansible/+/815200
Committed: https://opendev.org/openstack/tripleo-ansible/commit/e6f2ecfbfba3595e2b620d19fad6eb36a843dbff
Submitter: "Zuul (22348)"
Branch: stable/wallaby

commit e6f2ecfbfba3595e2b620d19fad6eb36a843dbff
Author: Harald Jensås <email address hidden>
Date: Fri Oct 8 13:01:17 2021 +0200

    Use service_net_map, not conditions on hard-coded networ names

    The ServiceNetMap defines the PublicNetwork, it defaults to
    'external' and fall's back to ctlplane. Let's use the ServiceNetMap
    when setting public_virtual_ip, tripleo::haproxy::public_virtual_ip
    and tripleo::keepalived::public_virtual_ip.

    This removes the conditionals on hard-coded network.name 'External'
    in vip_data.j2. This will allow custom network names to be used,
    either via overriding PublicNetwork in ServiceNetMap or using the
    service_net_map_replace in network data.

    Related-Bug: #1946239
    Change-Id: I6f159d0b117233ba655bbb348a578ae071dd1103
    (cherry picked from commit 32f1ac14359e8d629ffb2a56397e3a574ccd8765)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-ansible/+/815201
Committed: https://opendev.org/openstack/tripleo-ansible/commit/dc7f164ffa0c36b0c0f660d69bd1ab3b5ede63fa
Submitter: "Zuul (22348)"
Branch: stable/wallaby

commit dc7f164ffa0c36b0c0f660d69bd1ab3b5ede63fa
Author: Harald Jensås <email address hidden>
Date: Fri Oct 8 13:13:22 2021 +0200

    Use service_net_map for ganesha_vip

    Instead of if conditionals on hard-coded network names, use the
    ServiceNetMap. GaneshaNetwork defaults to 'storage_nfs' with a
    fallback to 'external' and then to 'ctlplane' in the ServiceNetMap.

    This will allow custom network names to be used,
    either via overriding GaneshaNetwork in ServiceNetMap or using the
    service_net_map_replace in network data.

    Related-Bug: #1946239
    Depends-On: I5804621a3081209bbae63193c1e09601826f4275
    Change-Id: Ic7743e7cd640703d166aecd97f59cbaf11c65500
    (cherry picked from commit 2894ef9d3e4208ee967b8eed8ccc7bef268414cd)

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/815598

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: master
Review: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/815599

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/815598
Committed: https://opendev.org/openstack/tripleo-heat-templates/commit/f6eddad78c5ae3aec266428ce768d65320785348
Submitter: "Zuul (22348)"
Branch: master

commit f6eddad78c5ae3aec266428ce768d65320785348
Author: Harald Jensås <email address hidden>
Date: Wed Oct 27 08:23:03 2021 +0200

    Don't use service_net_map_replace in krb-svc-principals

    Using the service_net_map replace in role_networks and
    as networks keys causes the actual custom networks to
    be filtered. I.e the service principals are not created.

    Not using service_net_map fixes the problem.

    This reverts commit f708ab7a827cc0db211b4709447f77126087347e.
    This partial reverts commit 578bcb2ffad32c6a39d68b5dc360504e95972ffa.

    Releted-Bug: #1946239
    Closes-Bug: #1886915
    Change-Id: I76a87473b2f21576570a55d0a5ef19f642521336

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/wallaby
Review: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/815649

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/815599
Committed: https://opendev.org/openstack/tripleo-heat-templates/commit/273b41a5da0267926072b9fd4e14c60db8180052
Submitter: "Zuul (22348)"
Branch: master

commit 273b41a5da0267926072b9fd4e14c60db8180052
Author: Harald Jensås <email address hidden>
Date: Wed Oct 27 09:08:39 2021 +0200

    Use ServiceNetMap to filter PublicNetwork in haproxy-tls

    Replace the filtering using the hard-coded "external"
    network name with a yaql filter using the PublicNetwork in
    ServiceNetMap instead.

    This should allow fully custom network name/name_lower to be
    used as long as service_net_map_replace is also used or the
    ServiceNetMap is provided with appropriate overrides.

    Also removes jinj2 filtering on 'tenant' network, this network
    does not have a VIP by default so it is alreayd filtered by the
    'and network.vip' in the jinj2 for loop. In the case 'tenant'
    network does have VIP it would make sense to create a certificate
    for it as well.

    Related-Bug: #1946239
    Change-Id: I7fa8e9931f27dbe3352b06c830441eac5bc3733e

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/wallaby
Review: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/815802

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/815197
Committed: https://opendev.org/openstack/tripleo-heat-templates/commit/5d4785bd61f5ff8b9edde370aa251dbddd7a2d63
Submitter: "Zuul (22348)"
Branch: stable/wallaby

commit 5d4785bd61f5ff8b9edde370aa251dbddd7a2d63
Author: Harald Jensås <email address hidden>
Date: Fri Oct 8 13:21:04 2021 +0200

    Default CephDashboardNetwork to storage_dashboard

    The default CephDashboardNetwork in ServiceNetMap was
    'ctlplane'. Change this to default to storage_dashboard
    with a fallback to 'ctlplane'.

    This will allow us to remove the hard-coded conditionals
    on 'StorageDashboard' network name in tripleo_hiera_data.

    Conflicts:
      overcloud-resource-registry-puppet.j2.yaml

    Related-Bug: #1946239
    Change-Id: I9a62b2cf24b2dd020de74e18af8c7bc0535d12d9
    (cherry picked from commit 28161b58682ac6d4e86b49ccf01395e40ffd613b)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-ansible/+/815202
Committed: https://opendev.org/openstack/tripleo-ansible/commit/01b38c26c2d49baf9ec654815bd884ef3e524d5c
Submitter: "Zuul (22348)"
Branch: stable/wallaby

commit 01b38c26c2d49baf9ec654815bd884ef3e524d5c
Author: Harald Jensås <email address hidden>
Date: Fri Oct 8 13:17:38 2021 +0200

    Use service_net_map for ceph_dashboard_vip

    Instead of if conditionals on hard-coded network names, use the
    ServiceNetMap. CephDashboardNetwork defaults to storage_dashboard
    with a fallback to 'ctlplane' in the ServiceNetMap.

    This will allow custom network names to be used, via overriding
    CephDashboardNetwork in ServiceNetMap or via service_net_map_replace
    in network data.

    Related-Bug: #1946239
    Depends-On: I9a62b2cf24b2dd020de74e18af8c7bc0535d12d9
    Change-Id: I145d6c0ddd3cbbfed92113db56e22299ab7c9b08
    (cherry picked from commit 3af34f0c68383ff733039f075fe7728baf0f888f)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-ansible/+/815203
Committed: https://opendev.org/openstack/tripleo-ansible/commit/9845747aca3db89a69eea5e3ee2488bb225f8eca
Submitter: "Zuul (22348)"
Branch: stable/wallaby

commit 9845747aca3db89a69eea5e3ee2488bb225f8eca
Author: Harald Jensås <email address hidden>
Date: Fri Oct 8 13:52:53 2021 +0200

    Use service_net_map for internal_api_vip

    Use the internal_api_network entry in service_net_map for
    internal_api_virtual_ip instead of conditions on hard-coded
    network name 'InternalApi'.

    Also clean up indentation for public_virtual_ip.

    Related-Bug: #1946239
    Depends-On: I1dcd9da59487bfa0842c5f131a0e9a9d9d0c676d
    Change-Id: Iaba927739f82253809b1f0a1c96b9ac98a005ed6
    (cherry picked from commit abbfc7f2aa119caff021944a78bd7b6fd6c97152)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-ansible/+/815204
Committed: https://opendev.org/openstack/tripleo-ansible/commit/24ce46ad53d8ee77de225383ef2eb6b67608fcda
Submitter: "Zuul (22348)"
Branch: stable/wallaby

commit 24ce46ad53d8ee77de225383ef2eb6b67608fcda
Author: Harald Jensås <email address hidden>
Date: Fri Oct 8 14:49:49 2021 +0200

    Filter network_virtual_ips using service_net_map

    Instead of filtering on hard-coded network names in
    THT/common/deploy-steps.j2:415 filter on the service_net_map
    in tripleo_hieradata.

    This allows us to remove the conditions based on hard-coded
    network names in: THT/common/deploy-steps.j2:415

    Related-Bug: #1946239
    Change-Id: I9c5d681c266db1e5048a1be6557c20abd5a07f7b
    (cherry picked from commit 362a54363f6b6b9beb923588ffbb94f3fa140e6f)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/814946
Committed: https://opendev.org/openstack/tripleo-heat-templates/commit/570b4718622af5592ca4b1a5bace31ea80b22769
Submitter: "Zuul (22348)"
Branch: stable/wallaby

commit 570b4718622af5592ca4b1a5bace31ea80b22769
Author: Harald Jensås <email address hidden>
Date: Fri Oct 8 15:44:51 2021 +0200

    Remove network_virtual_ips hard-coded name filter

    Remove the filtering of network_virtual_ips based on
    the hard-coded network names. The depends-on does similar
    filtering by using the service_net_map instead.

    This should allow better support for custom network names,
    custom ServiceNetMap and use of service_net_map_replace in
    network data.

    Related-Bug: #1946239
    Depends-On: I9c5d681c266db1e5048a1be6557c20abd5a07f7b
    Change-Id: I1c904d2f09e4679e50713d344abdff4fd830132a
    (cherry picked from commit 9e30f281fba7f108ad1eff37b721d2b1ac9a2cc9)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/815649
Committed: https://opendev.org/openstack/tripleo-heat-templates/commit/a45cc6fb532c1d6c49b3bf53b17e2d2fa45bd7a2
Submitter: "Zuul (22348)"
Branch: stable/wallaby

commit a45cc6fb532c1d6c49b3bf53b17e2d2fa45bd7a2
Author: Harald Jensås <email address hidden>
Date: Wed Oct 27 08:23:03 2021 +0200

    Don't use service_net_map_replace in krb-svc-principals

    Using the service_net_map replace in role_networks and
    as networks keys causes the actual custom networks to
    be filtered. I.e the service principals are not created.

    Not using service_net_map fixes the problem.

    This reverts commit f708ab7a827cc0db211b4709447f77126087347e.
    This partial reverts commit 578bcb2ffad32c6a39d68b5dc360504e95972ffa.

    Releted-Bug: #1946239
    Closes-Bug: #1886915
    Change-Id: I76a87473b2f21576570a55d0a5ef19f642521336
    (cherry picked from commit f6eddad78c5ae3aec266428ce768d65320785348)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/815802
Committed: https://opendev.org/openstack/tripleo-heat-templates/commit/d81762b77278e8c9d10a47aef24029eba4d6c38c
Submitter: "Zuul (22348)"
Branch: stable/wallaby

commit d81762b77278e8c9d10a47aef24029eba4d6c38c
Author: Harald Jensås <email address hidden>
Date: Wed Oct 27 09:08:39 2021 +0200

    Use ServiceNetMap to filter PublicNetwork in haproxy-tls

    Replace the filtering using the hard-coded "external"
    network name with a yaql filter using the PublicNetwork in
    ServiceNetMap instead.

    This should allow fully custom network name/name_lower to be
    used as long as service_net_map_replace is also used or the
    ServiceNetMap is provided with appropriate overrides.

    Also removes jinj2 filtering on 'tenant' network, this network
    does not have a VIP by default so it is alreayd filtered by the
    'and network.vip' in the jinj2 for loop. In the case 'tenant'
    network does have VIP it would make sense to create a certificate
    for it as well.

    Related-Bug: #1946239
    Change-Id: I7fa8e9931f27dbe3352b06c830441eac5bc3733e
    (cherry picked from commit 273b41a5da0267926072b9fd4e14c60db8180052)

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/ussuri
Review: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/817834

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/victoria
Review: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/817835

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/train
Review: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/817836

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/817835
Committed: https://opendev.org/openstack/tripleo-heat-templates/commit/f3930cc5b18daaf49d215229fff26db0c3286cc7
Submitter: "Zuul (22348)"
Branch: stable/victoria

commit f3930cc5b18daaf49d215229fff26db0c3286cc7
Author: Harald Jensås <email address hidden>
Date: Fri Oct 8 13:21:04 2021 +0200

    Default CephDashboardNetwork to storage_dashboard

    The default CephDashboardNetwork in ServiceNetMap was
    'ctlplane'. Change this to default to storage_dashboard
    with a fallback to 'ctlplane'.

    This will allow us to remove the hard-coded conditionals
    on 'StorageDashboard' network name in tripleo_hiera_data.

    Conflicts:
      overcloud-resource-registry-puppet.j2.yaml

    Related-Bug: #1946239
    Change-Id: I9a62b2cf24b2dd020de74e18af8c7bc0535d12d9
    (cherry picked from commit 28161b58682ac6d4e86b49ccf01395e40ffd613b)
    (cherry picked from commit 5d4785bd61f5ff8b9edde370aa251dbddd7a2d63)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/817834
Committed: https://opendev.org/openstack/tripleo-heat-templates/commit/5f3bec95404780dc64d44a0a346fdab3bf7c3481
Submitter: "Zuul (22348)"
Branch: stable/ussuri

commit 5f3bec95404780dc64d44a0a346fdab3bf7c3481
Author: Harald Jensås <email address hidden>
Date: Fri Oct 8 13:21:04 2021 +0200

    Default CephDashboardNetwork to storage_dashboard

    The default CephDashboardNetwork in ServiceNetMap was
    'ctlplane'. Change this to default to storage_dashboard
    with a fallback to 'ctlplane'.

    This will allow us to remove the hard-coded conditionals
    on 'StorageDashboard' network name in tripleo_hiera_data.

    Conflicts:
      overcloud-resource-registry-puppet.j2.yaml

    Related-Bug: #1946239
    Change-Id: I9a62b2cf24b2dd020de74e18af8c7bc0535d12d9
    (cherry picked from commit 28161b58682ac6d4e86b49ccf01395e40ffd613b)
    (cherry picked from commit 5d4785bd61f5ff8b9edde370aa251dbddd7a2d63)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/817836
Committed: https://opendev.org/openstack/tripleo-heat-templates/commit/b0bd3a3665a3ee9884e36106b15e152d8e8711b3
Submitter: "Zuul (22348)"
Branch: stable/train

commit b0bd3a3665a3ee9884e36106b15e152d8e8711b3
Author: Harald Jensås <email address hidden>
Date: Fri Oct 8 13:21:04 2021 +0200

    Default CephDashboardNetwork to storage_dashboard

    The default CephDashboardNetwork in ServiceNetMap was
    'ctlplane'. Change this to default to storage_dashboard
    with a fallback to 'ctlplane'.

    This will allow us to remove the hard-coded conditionals
    on 'StorageDashboard' network name in tripleo_hiera_data.

    Conflicts:
      overcloud-resource-registry-puppet.j2.yaml

    Related-Bug: #1946239
    Change-Id: I9a62b2cf24b2dd020de74e18af8c7bc0535d12d9
    (cherry picked from commit 28161b58682ac6d4e86b49ccf01395e40ffd613b)
    (cherry picked from commit 5d4785bd61f5ff8b9edde370aa251dbddd7a2d63)

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/victoria
Review: https://review.opendev.org/c/openstack/tripleo-ansible/+/818050

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/ussuri
Review: https://review.opendev.org/c/openstack/tripleo-ansible/+/818080

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/train
Review: https://review.opendev.org/c/openstack/tripleo-ansible/+/818081

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-ansible/+/818050
Committed: https://opendev.org/openstack/tripleo-ansible/commit/c8b144aa3e9df3db8a70ea4c709df1d293ec4051
Submitter: "Zuul (22348)"
Branch: stable/victoria

commit c8b144aa3e9df3db8a70ea4c709df1d293ec4051
Author: Harald Jensås <email address hidden>
Date: Fri Oct 8 13:17:38 2021 +0200

    Use service_net_map for ceph_dashboard_vip

    Instead of if conditionals on hard-coded network names, use the
    ServiceNetMap. CephDashboardNetwork defaults to storage_dashboard
    with a fallback to 'ctlplane' in the ServiceNetMap.

    This will allow custom network names to be used, via overriding
    CephDashboardNetwork in ServiceNetMap or via service_net_map_replace
    in network data.

    Related-Bug: #1946239
    Depends-On: I9a62b2cf24b2dd020de74e18af8c7bc0535d12d9
    Change-Id: I145d6c0ddd3cbbfed92113db56e22299ab7c9b08
    (cherry picked from commit 3af34f0c68383ff733039f075fe7728baf0f888f)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-ansible/+/818080
Committed: https://opendev.org/openstack/tripleo-ansible/commit/db47c4163963b4b639ef58ecf7942b06d4c9b11e
Submitter: "Zuul (22348)"
Branch: stable/ussuri

commit db47c4163963b4b639ef58ecf7942b06d4c9b11e
Author: Harald Jensås <email address hidden>
Date: Fri Oct 8 13:17:38 2021 +0200

    Use service_net_map for ceph_dashboard_vip

    Instead of if conditionals on hard-coded network names, use the
    ServiceNetMap. CephDashboardNetwork defaults to storage_dashboard
    with a fallback to 'ctlplane' in the ServiceNetMap.

    This will allow custom network names to be used, via overriding
    CephDashboardNetwork in ServiceNetMap or via service_net_map_replace
    in network data.

    Related-Bug: #1946239
    Depends-On: I9a62b2cf24b2dd020de74e18af8c7bc0535d12d9
    Change-Id: I145d6c0ddd3cbbfed92113db56e22299ab7c9b08
    (cherry picked from commit 3af34f0c68383ff733039f075fe7728baf0f888f)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-ansible/+/818081
Committed: https://opendev.org/openstack/tripleo-ansible/commit/78dd878ee5b9a14b32042006720f914b79787550
Submitter: "Zuul (22348)"
Branch: stable/train

commit 78dd878ee5b9a14b32042006720f914b79787550
Author: Harald Jensås <email address hidden>
Date: Fri Oct 8 13:17:38 2021 +0200

    Use service_net_map for ceph_dashboard_vip

    Instead of if conditionals on hard-coded network names, use the
    ServiceNetMap. CephDashboardNetwork defaults to storage_dashboard
    with a fallback to 'ctlplane' in the ServiceNetMap.

    This will allow custom network names to be used, via overriding
    CephDashboardNetwork in ServiceNetMap or via service_net_map_replace
    in network data.

    Related-Bug: #1946239
    Depends-On: I9a62b2cf24b2dd020de74e18af8c7bc0535d12d9
    Change-Id: I145d6c0ddd3cbbfed92113db56e22299ab7c9b08
    (cherry picked from commit 3af34f0c68383ff733039f075fe7728baf0f888f)

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/victoria
Review: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/822022

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/train
Review: https://review.opendev.org/c/openstack/tripleo-ansible/+/822044

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/victoria
Review: https://review.opendev.org/c/openstack/tripleo-ansible/+/822045

[OpenStack Infra (hudson-openstack)]

Change abandoned by "Tom Barron <email address hidden>" on branch: stable/train
Review: https://review.opendev.org/c/openstack/tripleo-ansible/+/822044
Reason: wrong branch, do newer branch backports first

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/ussuri
Review: https://review.opendev.org/c/openstack/tripleo-ansible/+/822680

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/ussuri
Review: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/822681

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/822022
Committed: https://opendev.org/openstack/tripleo-heat-templates/commit/3c4475acdfad351442bde8f0a9b3cb6326cef909
Submitter: "Zuul (22348)"
Branch: stable/victoria

commit 3c4475acdfad351442bde8f0a9b3cb6326cef909
Author: Harald Jensås <email address hidden>
Date: Fri Oct 8 14:47:23 2021 +0200

    GaneshaNetwork - fallback -> external -> ctlplane

    The GaneshaNetwork attempted to fallback to the external
    network in the case when storage_nfs network does not
    exists. It should also fallback to ctlplane in the case that
    the external network does not exist.

    Conflicts:
      overcloud-resource-registry-puppet.j2.yaml

    Related-Bug: #1946239
    Change-Id: I5804621a3081209bbae63193c1e09601826f4275
    (cherry picked from commit c0b778301fff8f069c662f382b1e93806e876bee)
    (cherry picked from commit b1c7478e06a1990c8def9183fb6e0fecc696f7f3)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/822681
Committed: https://opendev.org/openstack/tripleo-heat-templates/commit/d56cb44178e235ee49f0ec56ac9fe6cace59bd0a
Submitter: "Zuul (22348)"
Branch: stable/ussuri

commit d56cb44178e235ee49f0ec56ac9fe6cace59bd0a
Author: Harald Jensås <email address hidden>
Date: Fri Oct 8 14:47:23 2021 +0200

    GaneshaNetwork - fallback -> external -> ctlplane

    The GaneshaNetwork attempted to fallback to the external
    network in the case when storage_nfs network does not
    exists. It should also fallback to ctlplane in the case that
    the external network does not exist.

    Conflicts:
      overcloud-resource-registry-puppet.j2.yaml

    Related-Bug: #1946239
    Change-Id: I5804621a3081209bbae63193c1e09601826f4275
    (cherry picked from commit c0b778301fff8f069c662f382b1e93806e876bee)
    (cherry picked from commit b1c7478e06a1990c8def9183fb6e0fecc696f7f3)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-ansible/+/822045
Committed: https://opendev.org/openstack/tripleo-ansible/commit/6fc91a9657cb734ebb1249b4713ed6957c955d31
Submitter: "Zuul (22348)"
Branch: stable/victoria

commit 6fc91a9657cb734ebb1249b4713ed6957c955d31
Author: Harald Jensås <email address hidden>
Date: Fri Oct 8 13:13:22 2021 +0200

    Use service_net_map for ganesha_vip

    Instead of if conditionals on hard-coded network names, use the
    ServiceNetMap. GaneshaNetwork defaults to 'storage_nfs' with a
    fallback to 'external' and then to 'ctlplane' in the ServiceNetMap.

    This will allow custom network names to be used,
    either via overriding GaneshaNetwork in ServiceNetMap or using the
    service_net_map_replace in network data.

    Related-Bug: #1946239
    Change-Id: Ic7743e7cd640703d166aecd97f59cbaf11c65500
    (cherry picked from commit 2894ef9d3e4208ee967b8eed8ccc7bef268414cd)
    (cherry picked from commit dc7f164ffa0c36b0c0f660d69bd1ab3b5ede63fa)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-ansible/+/822680
Committed: https://opendev.org/openstack/tripleo-ansible/commit/fcb25bd25606a92393845406b93376c47501dd43
Submitter: "Zuul (22348)"
Branch: stable/ussuri

commit fcb25bd25606a92393845406b93376c47501dd43
Author: Harald Jensås <email address hidden>
Date: Fri Oct 8 13:13:22 2021 +0200

    Use service_net_map for ganesha_vip

    Instead of if conditionals on hard-coded network names, use the
    ServiceNetMap. GaneshaNetwork defaults to 'storage_nfs' with a
    fallback to 'external' and then to 'ctlplane' in the ServiceNetMap.

    This will allow custom network names to be used,
    either via overriding GaneshaNetwork in ServiceNetMap or using the
    service_net_map_replace in network data.

    Related-Bug: #1946239
    Depends-On: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/822681
    Change-Id: Ic7743e7cd640703d166aecd97f59cbaf11c65500
    (cherry picked from commit 2894ef9d3e4208ee967b8eed8ccc7bef268414cd)
    (cherry picked from commit dc7f164ffa0c36b0c0f660d69bd1ab3b5ede63fa)

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/train
Review: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/823298

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/823298
Committed: https://opendev.org/openstack/tripleo-heat-templates/commit/df133f2888f6fbb36b137041f9a53a8a5b75a9d8
Submitter: "Zuul (22348)"
Branch: stable/train

commit df133f2888f6fbb36b137041f9a53a8a5b75a9d8
Author: Harald Jensås <email address hidden>
Date: Fri Oct 8 14:47:23 2021 +0200

    GaneshaNetwork - fallback -> external -> ctlplane

    The GaneshaNetwork attempted to fallback to the external
    network in the case when storage_nfs network does not
    exists. It should also fallback to ctlplane in the case that
    the external network does not exist.

    Conflicts:
      overcloud-resource-registry-puppet.j2.yaml

    Related-Bug: #1946239
    Change-Id: I5804621a3081209bbae63193c1e09601826f4275
    (cherry picked from commit c0b778301fff8f069c662f382b1e93806e876bee)
    (cherry picked from commit b1c7478e06a1990c8def9183fb6e0fecc696f7f3)
    (cherry picked from commit d56cb44178e235ee49f0ec56ac9fe6cace59bd0a)

[OpenStack Infra (hudson-openstack)]

Change abandoned by "Tom Barron <email address hidden>" on branch: stable/train
Review: https://review.opendev.org/c/openstack/tripleo-ansible/+/822044

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-ansible/+/822044
Committed: https://opendev.org/openstack/tripleo-ansible/commit/5e744eb622bf02dcb104e6c21dc22b8cc6e65c09
Submitter: "Zuul (22348)"
Branch: stable/train

commit 5e744eb622bf02dcb104e6c21dc22b8cc6e65c09
Author: Harald Jensås <email address hidden>
Date: Fri Oct 8 13:13:22 2021 +0200

    Use service_net_map for ganesha_vip

    Instead of if conditionals on hard-coded network names, use the
    ServiceNetMap. GaneshaNetwork defaults to 'storage_nfs' with a
    fallback to 'external' and then to 'ctlplane' in the ServiceNetMap.

    This will allow custom network names to be used,
    either via overriding GaneshaNetwork in ServiceNetMap or using the
    service_net_map_replace in network data.

    Related-Bug: #1946239

    Change-Id: Ic7743e7cd640703d166aecd97f59cbaf11c65500
    (cherry picked from commit 2894ef9d3e4208ee967b8eed8ccc7bef268414cd)
    (cherry picked from commit dc7f164ffa0c36b0c0f660d69bd1ab3b5ede63fa)
    (cherry picked from commit fcb25bd25606a92393845406b93376c47501dd43)