From 02b308343773684cc0757e51e4398f4c0a143583 Mon Sep 17 00:00:00 2001 From: Francesco Pantano Date: Thu, 19 Mar 2020 15:24:02 +0100 Subject: [PATCH] Fix grafana haproxy frontend ip variable Grafana could be exposed along with ceph dashboard but it's actually embedded by in a view created for this purpose. For this reason the ceph-dashboard component should be able to reach grafana or the requests will fail. Closes-Bug: #1868118 Change-Id: I7894c51d18961c5cab7ac62e5eec5d515e2667c8 (cherry picked from commit b6175ece1ac77647e78e38f69648a8ac6c8795ee) --- manifests/haproxy.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp index 90e07b9f7..34ffa5c5e 100644 --- a/manifests/haproxy.pp +++ b/manifests/haproxy.pp @@ -1050,7 +1050,7 @@ class tripleo::haproxy ( if $ceph_grafana { ::tripleo::haproxy::endpoint { 'ceph_grafana': - internal_ip => hiera('ceph_grafana_vip', $controller_virtual_ip), + internal_ip => hiera('ceph_dashboard_vip', $controller_virtual_ip), service_port => $ports[ceph_grafana_port], ip_addresses => hiera('ceph_grafana_node_ips', $controller_hosts_real), server_names => hiera('ceph_grafana_node_names', $controller_hosts_names_real),