Skip to content

Commit 1e74cc6

Browse files
committed
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 770a527 Signed-off-by: John Fulton <fulton@redhat.com>
1 parent 770a527 commit 1e74cc6

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

infrastructure-playbooks/cephadm-adopt.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1488,8 +1488,8 @@
14881488
placement:
14891489
label: "{{ monitoring_group_name }}"
14901490
count: "{{ groups.get(monitoring_group_name, []) | length }}"
1491-
{% if grafana_server_addr is defined %}
1492-
networks: {{ grafana_server_addr.split(',') | list if ',' in grafana_server_addr else grafana_server_addr | string }}
1491+
{% if grafana_network is defined %}
1492+
networks: {{ grafana_network.split(',') | list if ',' in grafana_network else [grafana_network] }}
14931493
{% endif %}
14941494
delegate_to: "{{ groups[mon_group_name][0] }}"
14951495
environment:
@@ -1511,8 +1511,8 @@
15111511
placement:
15121512
label: {{ monitoring_group_name }}
15131513
count: {{ groups.get(monitoring_group_name, []) | length }}
1514-
{% if grafana_server_addr is defined %}
1515-
networks: {{ grafana_server_addr.split(',') | list if ',' in grafana_server_addr else grafana_server_addr | string }}
1514+
{% if grafana_network is defined %}
1515+
networks: {{ grafana_network.split(',') | list if ',' in grafana_network else [grafana_network] }}
15161516
{% endif %}
15171517
{% if prometheus_port is defined and prometheus_port != 9095 %}
15181518
spec:

0 commit comments

Comments
 (0)