ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ephadm-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 <tonay@ibm.com>
(cherry picked from commit 31be495061)
mergify/bp/stable-7.0/pr-7613
Teoman ONAY 2024-10-02 16:43:39 +02:00
parent 5e7cefff33
commit f8bd922265
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
infrastructure-playbooks/cephadm-adopt.yml
View File

@ -1517,8 +1517,8 @@
environment: environment:
CEPHADM_IMAGE: '{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}' CEPHADM_IMAGE: '{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}'
- name: with dashboard enabled - name: With dashboard enabled
when: dashboard_enabled | bool when: dashboard_enabled | bool and groups.get(monitoring_group_name, []) | length > 0
block: block:
- name: Update the placement of alertmanager hosts - name: Update the placement of alertmanager hosts
ceph_orch_apply: ceph_orch_apply:
@ -1528,6 +1528,7 @@
service_id: "{{ ansible_facts['hostname'] }}" service_id: "{{ ansible_facts['hostname'] }}"
placement: placement:
label: "{{ monitoring_group_name }}" label: "{{ monitoring_group_name }}"
count: "{{ groups.get(monitoring_group_name, []) | length }}"
{% if grafana_server_addr is defined %} {% if grafana_server_addr is defined %}
networks: networks:
- {{ grafana_server_addr }} - {{ grafana_server_addr }}
@ -1542,10 +1543,6 @@
environment: environment:
CEPHADM_IMAGE: '{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}' CEPHADM_IMAGE: '{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}'
<<<<<<< HEAD
- name: update the placement of prometheus hosts
command: "{{ cephadm_cmd }} shell -k /etc/ceph/{{ cluster }}.client.admin.keyring --fsid {{ fsid }} -- ceph orch apply prometheus --placement='{{ groups.get(monitoring_group_name, []) | length }} label:{{ monitoring_group_name }}'"
=======
- name: Update the placement of prometheus hosts - name: Update the placement of prometheus hosts
ceph_orch_apply: ceph_orch_apply:
fsid: "{{ fsid }}" fsid: "{{ fsid }}"
@ -1559,7 +1556,6 @@
spec: spec:
port: {{ prometheus_port }} port: {{ prometheus_port }}
{% endif %} {% endif %}
>>>>>>> b41b7bf86 (cephadm-adopt: custom prometheus port lost after adoption)
changed_when: false changed_when: false
environment: environment:
CEPHADM_IMAGE: '{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}' CEPHADM_IMAGE: '{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}'