Compute grafana_vip using net_vip_map instead of hiera

This change fixes the way the grafana vip is computed: now it
uses the existing net_vip_map instead of running hiera commands
on the undercloud.

Change-Id: Ibad723edaa2de9ffad896d8f85ca9b5c09aa0678
(cherry picked from commit 5a8c23c64e)
This commit is contained in:
Francesco Pantano 2022-06-20 14:28:54 +02:00
parent 263f5980c6
commit 06af650f07
1 changed files with 3 additions and 14 deletions

View File

@ -36,20 +36,9 @@
set_fact:
tripleo_enabled_services: "{{ enabled_services | default([]) }}"
- name: set dashboard_vip variable if dashboard is enabled
block:
- name: get the frontend_dashboard_vip from the overcloud vars
command: "hiera -c /etc/puppet/hiera.yaml ceph_dashboard_vip"
register: frontend_vip
become: true
- name: set dashboard_frontend variable
set_fact:
grafana_vip: |-
{% set dashboard_vip = control_virtual_ip %}
{% if frontend_vip.stdout != "nil" %}
{% set dashboard_vip = frontend_vip.stdout %}
{% endif %}
{{ dashboard_vip }}
- name: "Set grafana_vip: {{ net_vip_map[service_net_map['ceph_dashboard_network']] }}"
set_fact:
grafana_vip: "{{ net_vip_map[service_net_map['ceph_dashboard_network']] }}"
when:
- tripleo_enabled_services | intersect(['ceph_grafana'])