ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ceph-facts: update external grafana fact filter 

e695efc hasn't been updated with the changes introduced in 9bb11c7 so
the ips_in_ranges filter isn't used for an external grafana instance.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 20b1a464ec)
pull/4509/head
Dimitri Savineau 2019-09-30 16:09:38 -04:00 committed by Dimitri Savineau
parent af9f93f07f
commit 7bb835240e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/ceph-facts/tasks/facts.yml
View File

@ -331,7 +331,7 @@
- name: set grafana_server_addr fact - ipv4 - (external instance) - name: set grafana_server_addr fact - ipv4 - (external instance)
set_fact: set_fact:
grafana_server_addr: "{{ hostvars[groups.get(grafana_server_group_name, []) | first]['ansible_all_ipv4_addresses'] | ipaddr(public_network) | first }}" grafana_server_addr: "{{ hostvars[groups.get(grafana_server_group_name, []) | first]['ansible_all_ipv4_addresses'] | ips_in_ranges(public_network.split(',')) | first }}"
when: when:
- groups.get(grafana_server_group_name, []) | length > 0 - groups.get(grafana_server_group_name, []) | length > 0
- ip_version == 'ipv4' - ip_version == 'ipv4'
@ -340,7 +340,7 @@
- name: set grafana_server_addr fact - ipv6 - (external instance) - name: set grafana_server_addr fact - ipv6 - (external instance)
set_fact: set_fact:
grafana_server_addr: "{{ hostvars[groups.get(grafana_server_group_name, []) | first]['ansible_all_ipv6_addresses'] | ipaddr(public_network) | last | ipwrap }}" grafana_server_addr: "{{ hostvars[groups.get(grafana_server_group_name, []) | first]['ansible_all_ipv6_addresses'] | ips_in_ranges(public_network.split(',')) | last | ipwrap }}"
when: when:
- groups.get(grafana_server_group_name, []) | length > 0 - groups.get(grafana_server_group_name, []) | length > 0
- ip_version == 'ipv6' - ip_version == 'ipv6'