From 0bf3398774dda6683f74a48f0ff3b26be6acec5a Mon Sep 17 00:00:00 2001 From: Teoman ONAY Date: Thu, 11 Jul 2024 11:35:22 +0200 Subject: [PATCH] cephadm-adopt: Fixes binding network for alertmanager Alertmanager was bind to default * network instead of grafana_server_addr as it was before. Now on if grafana_server_addr is defined, it will be bind to that network. Signed-off-by: Teoman ONAY --- infrastructure-playbooks/cephadm-adopt.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/infrastructure-playbooks/cephadm-adopt.yml b/infrastructure-playbooks/cephadm-adopt.yml index ee6dbdeb6d..e051d63362 100644 --- a/infrastructure-playbooks/cephadm-adopt.yml +++ b/infrastructure-playbooks/cephadm-adopt.yml @@ -1471,8 +1471,18 @@ when: dashboard_enabled | bool block: - name: Update the placement of alertmanager hosts - ansible.builtin.command: "{{ cephadm_cmd }} shell -k /etc/ceph/{{ cluster }}.client.admin.keyring --fsid {{ fsid }} -- ceph orch apply alertmanager --placement='{{ groups.get(monitoring_group_name, []) | length }} label:{{ monitoring_group_name }}'" - changed_when: false + ceph_orch_apply: + fsid: "{{ fsid }}" + spec: | + service_type: alertmanager + service_id: "{{ ansible_facts['hostname'] }}" + placement: + label: "{{ monitoring_group_name }}" + {% if grafana_server_addr is defined %} + networks: + - {{ grafana_server_addr }} + {% endif %} + delegate_to: "{{ groups[mon_group_name][0] }}" environment: CEPHADM_IMAGE: '{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}'