From 7b219a42d6fe5a26842dbcad17cc8e5ff57513af Mon Sep 17 00:00:00 2001 From: Tom Barron Date: Tue, 3 Aug 2021 12:52:07 -0400 Subject: [PATCH] Default ganesha-internal service endpoint to external network This is a clean cherry-pick except that the path to the relevant file changed in the master branch. Closes-Bug: #1938639 (cherry picked from commit e104c6e623c32f7606eaaa40751c61c35c5780bb) Change-Id: I4c4cd976d9a997b39e7e3937e49193a10f872ae3 (cherry picked from commit bde560231296ca313d57728ed54bb1b7a54a2f78) (cherry picked from commit 72ff3686e40da9aacb7ef9ed33c8dc49ec5fcb33) --- network/service_net_map.j2.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/network/service_net_map.j2.yaml b/network/service_net_map.j2.yaml index 9f9e331228..f22760c529 100644 --- a/network/service_net_map.j2.yaml +++ b/network/service_net_map.j2.yaml @@ -68,7 +68,9 @@ parameters: RabbitmqNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} QdrNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} RedisNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - GaneshaNetwork: {{ _service_nets.get('storage_nfs', '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') }} MysqlNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} SnmpdNetwork: ctlplane CephClusterNetwork: {{ _service_nets.get('storage_mgmt', 'ctlplane') }}