openstack
/
puppet-tripleo
Code Issues Proposed changes

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 b6175ece1a)
This commit is contained in:
Francesco Pantano 2020-03-19 15:24:02 +01:00
parent 116e8e8d12
commit 02b3083437
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/haproxy.pp
View File

@ -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),