From aa034a8c36e750135fe01a11531f5d1eeaf36e8c Mon Sep 17 00:00:00 2001 From: Goutham Pacha Ravi Date: Thu, 17 Oct 2019 12:17:19 -0700 Subject: [PATCH] Fix invalid variable issue with StorageNFS The `ganesha_vip` comes from a network called StorageNFS; but its lookup in the `net_vip_map` dictionary was incorrect. Change-Id: I5a8b49cce65963d35b610e138808030ed84de2de Closes-Bug: #1849393 (cherry picked from commit e3625095eab3adbdeb65175cd7fe31688ac1306b) --- ...ix-retrieval-of-storage-nfs-params-5f92d7999c36ef05.yaml | 6 ++++++ .../roles/tripleo-hieradata/templates/vip_data.j2 | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/bug-1849393-fix-retrieval-of-storage-nfs-params-5f92d7999c36ef05.yaml diff --git a/releasenotes/notes/bug-1849393-fix-retrieval-of-storage-nfs-params-5f92d7999c36ef05.yaml b/releasenotes/notes/bug-1849393-fix-retrieval-of-storage-nfs-params-5f92d7999c36ef05.yaml new file mode 100644 index 000000000..eaa22540e --- /dev/null +++ b/releasenotes/notes/bug-1849393-fix-retrieval-of-storage-nfs-params-5f92d7999c36ef05.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + An incorrect lookup issue with respect to the StorageNFS network has + been fixed. See `Launchpad bug 1849393 + `_ for more details. diff --git a/tripleo_ansible/roles/tripleo-hieradata/templates/vip_data.j2 b/tripleo_ansible/roles/tripleo-hieradata/templates/vip_data.j2 index ad5729935..eaebbcb32 100644 --- a/tripleo_ansible/roles/tripleo-hieradata/templates/vip_data.j2 +++ b/tripleo_ansible/roles/tripleo-hieradata/templates/vip_data.j2 @@ -14,7 +14,7 @@ {% set _ = vip_data.__setitem__('network_virtual_ips', network_virtual_ips) %} {% for network in enabled_networks %} {% if network == 'StorageNFS' %} -{% set _ = vip_data.__setitem__('ganesha_vip', (net_vip_map[storagenfs_net_name])) %} +{% set _ = vip_data.__setitem__('ganesha_vip', (net_vip_map[networks['StorageNFS']['name_lower']])) %} {% endif %} {% if network == 'StorageDashboard' %} {% set _ = vip_data.__setitem__('ceph_grafana_vip', (net_vip_map.storage_dashboard)) %}