From: John Fulton Date: Fri, 7 Feb 2025 18:08:03 +0000 (-0500) Subject: Adopt with grafana_network not grafana_server_addr X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b1f7e2da0602ab4234c511774a6c098a8e753eb9;p=ceph-ansible.git Adopt with grafana_network not grafana_server_addr The networks list in a spec is usually a list of ranges, not a single IP. The grafana_server_addr is a fact created from the grafana_network range so it is a more appropriate parameter to pass to the spec. Follow up to 770a527a9ee6b34091798c6120235026ad1ecfa9 Signed-off-by: John Fulton --- diff --git a/infrastructure-playbooks/cephadm-adopt.yml b/infrastructure-playbooks/cephadm-adopt.yml index 25cc2000e..c12bfe640 100644 --- a/infrastructure-playbooks/cephadm-adopt.yml +++ b/infrastructure-playbooks/cephadm-adopt.yml @@ -1488,8 +1488,8 @@ placement: label: "{{ monitoring_group_name }}" count: "{{ groups.get(monitoring_group_name, []) | length }}" - {% if grafana_server_addr is defined %} - networks: {{ grafana_server_addr.split(',') | list if ',' in grafana_server_addr else grafana_server_addr | string }} + {% if grafana_network is defined %} + networks: {{ grafana_network.split(',') | list if ',' in grafana_network else [grafana_network] }} {% endif %} delegate_to: "{{ groups[mon_group_name][0] }}" environment: @@ -1511,8 +1511,8 @@ placement: label: {{ monitoring_group_name }} count: {{ groups.get(monitoring_group_name, []) | length }} - {% if grafana_server_addr is defined %} - networks: {{ grafana_server_addr.split(',') | list if ',' in grafana_server_addr else grafana_server_addr | string }} + {% if grafana_network is defined %} + networks: {{ grafana_network.split(',') | list if ',' in grafana_network else [grafana_network] }} {% endif %} {% if prometheus_port is defined and prometheus_port != 9095 %} spec: