From 78bb1459eaef9292063b73b18dd662f5f7c7c0f8 Mon Sep 17 00:00:00 2001 From: Marcus Klein Date: Mon, 18 Nov 2024 15:11:58 +0100 Subject: [PATCH] Fix Grafana deployment Change-Id: I45c4f4f87a348d83d50952ab658058a1dc88ff08 --- grafana/readme.rst | 6 +++--- grafana/requirements.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/grafana/readme.rst b/grafana/readme.rst index c932553c..08347c06 100644 --- a/grafana/readme.rst +++ b/grafana/readme.rst @@ -21,10 +21,10 @@ lines haproxy_extra_services: - service: haproxy_service_name: grafana - haproxy_ssl: False + haproxy_ssl: "{{ haproxy_ssl }}" haproxy_backend_nodes: "{{ groups['grafana'] | default([]) }}" haproxy_port: 3000 # This is set using the "grafana_port" variable - haproxy_balance_type: tcp + haproxy_balance_type: http Deployment Process ------------------ @@ -68,4 +68,4 @@ install grafana .. code-block:: bash cd /opt/openstack-ansible-ops/grafana - openstack-ansible installGrafana.yml + ANSIBLE_INJECT_FACT_VARS=True openstack-ansible installGrafana.yml diff --git a/grafana/requirements.yml b/grafana/requirements.yml index 8f04eefd..397929cc 100644 --- a/grafana/requirements.yml +++ b/grafana/requirements.yml @@ -2,5 +2,5 @@ collections: - name: grafana.grafana - version: 2.2.3 + version: 5.6.0 type: galaxy