From 3aad0b2aa921901ce5d78603adea2c67ff23ccc4 Mon Sep 17 00:00:00 2001 From: John Fulton Date: Fri, 7 Feb 2025 13:08:03 -0500 Subject: [PATCH] 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 (cherry picked from commit b1f7e2da0602ab4234c511774a6c098a8e753eb9) --- infrastructure-playbooks/cephadm-adopt.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/infrastructure-playbooks/cephadm-adopt.yml b/infrastructure-playbooks/cephadm-adopt.yml index e542dcdd7..fa603f7bf 100644 --- a/infrastructure-playbooks/cephadm-adopt.yml +++ b/infrastructure-playbooks/cephadm-adopt.yml @@ -1486,9 +1486,8 @@ placement: label: "{{ monitoring_group_name }}" count: "{{ groups.get(monitoring_group_name, []) | length }}" - {% if grafana_server_addr is defined %} - networks: - - {{ grafana_server_addr }} + {% 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: @@ -1509,6 +1508,9 @@ placement: label: {{ monitoring_group_name }} count: {{ groups.get(monitoring_group_name, []) | length }} + {% 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: port: {{ prometheus_port }} -- 2.39.5