]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
facts: fix bug in grafana_server_addr fact setting
authorGuillaume Abrioux <gabrioux@redhat.com>
Mon, 24 Jun 2019 20:30:23 +0000 (22:30 +0200)
committerGuillaume Abrioux <gabrioux@redhat.com>
Wed, 26 Jun 2019 08:49:30 +0000 (10:49 +0200)
If no grafana-server group is defined while an mgr group is, that task
will fail because `hostvars[groups[grafana_server_group_name][0]` can't
return anything since `groups['grafana-server']` will be a non existing
key.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
roles/ceph-facts/tasks/facts.yml

index 987c111817706904be217f6ba295bbd9479c2866..e76b915d82fc954944de965b3d39cb24a14abd22 100644 (file)
 
 - name: set grafana_server_addr fact
   set_fact:
-    grafana_server_addr: "{{ (hostvars[groups[grafana_server_group_name][0] | default(groups[mgr_group_name][0])])['ansible_all_ipv4_addresses'] | ipaddr(public_network) | first }}"
-  when:  groups.get(grafana_server_group_name, []) | length > 0 or groups.get(mgr_group_name, []) | length > 0
+    grafana_server_addr: "{{ (hostvars[groups[grafana_server_group_name][0] if groups.get(grafana_server_group_name, []) | length > 0 else groups[mgr_group_name][0]])['ansible_all_ipv4_addresses'] | ipaddr(public_network) | first }}"
+  when:
+    - (groups.get(grafana_server_group_name, []) | length > 0 or groups.get(mgr_group_name, []) | length > 0)
+    - dashboard_enabled | bool