From b0a990ca88ec783695ca89be1d57c948ae3791d2 Mon Sep 17 00:00:00 2001 From: Teoman ONAY Date: Wed, 2 Oct 2024 16:43:39 +0200 Subject: [PATCH] cephadm-adopt: Alertmanager placement count missing Regression from #7576. Alertmanager placement count was missing after migration to ceph_orch_apply module Signed-off-by: Teoman ONAY (cherry picked from commit 31be49506118ece75371d0c86af794caee8bc051) # Conflicts: # infrastructure-playbooks/cephadm-adopt.yml --- infrastructure-playbooks/cephadm-adopt.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/infrastructure-playbooks/cephadm-adopt.yml b/infrastructure-playbooks/cephadm-adopt.yml index 859eacd1ce..7dbc94b7c4 100644 --- a/infrastructure-playbooks/cephadm-adopt.yml +++ b/infrastructure-playbooks/cephadm-adopt.yml @@ -1517,8 +1517,13 @@ environment: CEPHADM_IMAGE: '{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}' +<<<<<<< HEAD - name: with dashboard enabled when: dashboard_enabled | bool +======= + - name: With dashboard enabled + when: dashboard_enabled | bool and groups.get(monitoring_group_name, []) | length > 0 +>>>>>>> 31be49506 (cephadm-adopt: Alertmanager placement count missing) block: - name: Update the placement of alertmanager hosts ceph_orch_apply: @@ -1528,6 +1533,7 @@ service_id: "{{ ansible_facts['hostname'] }}" placement: label: "{{ monitoring_group_name }}" + count: "{{ groups.get(monitoring_group_name, []) | length }}" {% if grafana_server_addr is defined %} networks: - {{ grafana_server_addr }}