]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
ceph-infra: replace hardcoded grafana group name
authorDimitri Savineau <dsavinea@redhat.com>
Mon, 16 Dec 2019 16:03:21 +0000 (11:03 -0500)
committerDimitri Savineau <savineau.dimitri@gmail.com>
Wed, 8 Jan 2020 21:15:09 +0000 (16:15 -0500)
The grafana-server group name was hardcoded for the grafana/prometheus
firewalld tasks condition.
We should we the associated variable : grafana_server_group_name

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 2c06678cdeed20f0d40f1693abbf8678250c25ea)

roles/ceph-infra/tasks/dashboard_firewall.yml

index 4c3913e1eaacb2b143bdf44094312288ac528c44..f3166355da70b07853298d150b68b68fbe2768f3 100644 (file)
@@ -52,4 +52,6 @@
         permanent: true
         immediate: true
         state: enabled
-  when: inventory_hostname in groups.get('grafana-server', [])
+  when:
+    - grafana_server_group_name is defined
+    - grafana_server_group_name in group_names