From df133f2888f6fbb36b137041f9a53a8a5b75a9d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Fri, 8 Oct 2021 14:47:23 +0200 Subject: [PATCH] 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) --- network/service_net_map.j2.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/network/service_net_map.j2.yaml b/network/service_net_map.j2.yaml index 9bb236f10d..516d12b68a 100644 --- a/network/service_net_map.j2.yaml +++ b/network/service_net_map.j2.yaml @@ -73,7 +73,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') }}