Set ganesha_vip when no StoragetNFS network

is deployed.

Normally when Ganesha is deployed for CephFS through NFS,
the StorageNFS isolated network is deployed and we set
the address for ganesha_vip on that network.  But with
Standalone role the StorageNFS network is not deployed
so ganesha_vip is not set in the tripleo hieradata unless
it is provided by extra config.

Set it to net_vip_map.external in the event that it has
not been set on the StorageNFS network.  Note that external
is chosen rather than ctlplane since the VIP must be reachable
from compute instances, guest VMs, that should have no access
to the ctlplane network.

Closes-Bug: #1911022
Change-Id: Ia97533c0b8b3b8498a173e1d363323dcdc77cce4
(cherry picked from commit 0aceca00e7)
(cherry picked from commit 520b1e1edb)
This commit is contained in:
Tom Barron 2021-08-01 11:18:25 -04:00
parent 92d6579d52
commit 3ff85eb7db
1 changed files with 5 additions and 0 deletions

View File

@ -20,6 +20,11 @@
{% if network == 'StorageNFS' %}
{% set _ = vip_data.__setitem__('ganesha_vip', (net_vip_map[networks['StorageNFS']['name_lower']])) %}
{% endif %}
{% if not vip_data.ganesha_vip is defined %}
{% if 'External' in enabled_networks %}
{% set _ = vip_data.__setitem__('ganesha_vip', (net_vip_map[networks['External']['name_lower']])) %}
{% endif %}
{% endif %}
{% if network == 'StorageDashboard' %}
{% set _ = vip_data.__setitem__('ceph_dashboard_vip', (net_vip_map[networks['StorageDashboard']['name_lower']])) %}
{% endif %}