openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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 c0b778301f)
(cherry picked from commit b1c7478e06)
This commit is contained in:
Harald Jensås 2021-10-08 14:47:23 +02:00 committed by Tom Barron
parent 0816be84ac
commit d56cb44178
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
network/service_net_map.j2.yaml
View File

@ -70,7 +70,7 @@ parameters:
RedisNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
# Guest VMs use GaneshaNetwork and cannot reach ctlplane network,
# so default to external when storage_nfs is not available.
GaneshaNetwork: {{ _service_nets.get('storage_nfs', 'external') }}
GaneshaNetwork: {{ _service_nets.get('storage_nfs', _service_nets.get('external', 'ctlplane')) }}
MysqlNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
SnmpdNetwork: ctlplane
CephClusterNetwork: {{ _service_nets.get('storage_mgmt', 'ctlplane') }}