Skip to content

Commit a632e63

Browse files
committed
Adopt: placement of alertmanager hosts fails
- Task fails as count is set as a string while a number is expected - typo service_name instead of service_type Signed-off-by: Teoman ONAY <tonay@ibm.com>
1 parent 5b11ada commit a632e63

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

infrastructure-playbooks/cephadm-adopt.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,7 @@
476476
- name: Set_fact admin_rbd_cmd
477477
ansible.builtin.set_fact:
478478
admin_rbd_cmd: "{{ container_binary + ' run --rm --net=host -v /etc/ceph:/etc/ceph:z -v /var/lib/ceph:/var/lib/ceph:z -v /var/run/ceph:/var/run/ceph:z --entrypoint=rbd ' + ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment | bool else 'ceph' }} --cluster {{ cluster }}"
479+
479480
- name: Get mirror pool info
480481
ansible.builtin.command: "{{ rbd_cmd }} mirror pool info {{ ceph_rbd_mirror_pool }} --format json"
481482
register: mirror_pool_info
@@ -544,8 +545,6 @@
544545
path: "{{ tmp_file.path }}"
545546
state: absent
546547
delegate_to: "{{ groups.get(mon_group_name | default('mons'))[0] }}"
547-
548-
549548
- name: Adopt ceph mon daemons
550549
hosts: "{{ mon_group_name|default('mons') }}"
551550
serial: 1
@@ -1157,7 +1156,6 @@
11571156
- /etc/systemd/system/ceph-rbd-mirror@.service.d
11581157
- /etc/systemd/system/ceph-rbd-mirror.target
11591158

1160-
11611159
- name: Redeploy ceph-crash daemons
11621160
hosts:
11631161
- "{{ mon_group_name|default('mons') }}"
@@ -1194,7 +1192,6 @@
11941192
environment:
11951193
CEPHADM_IMAGE: '{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}'
11961194

1197-
11981195
- name: Redeploy ceph-exporter daemons
11991196
hosts:
12001197
- "{{ mon_group_name|default('mons') }}"
@@ -1230,8 +1227,6 @@
12301227
delegate_to: '{{ groups[mon_group_name][0] }}'
12311228
environment:
12321229
CEPHADM_IMAGE: '{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}'
1233-
1234-
12351230
- name: Redeploy alertmanager/grafana/prometheus daemons
12361231
hosts: "{{ monitoring_group_name|default('monitoring') }}"
12371232
serial: 1
@@ -1278,7 +1273,6 @@
12781273
with_items:
12791274
- "{{ alertmanager_data_dir }}"
12801275
- "{{ prometheus_data_dir }}"
1281-
12821276
# (workaround) cephadm adopt alertmanager only stops prometheus-alertmanager systemd service
12831277
- name: Stop and disable alertmanager systemd unit
12841278
ansible.builtin.service:
@@ -1444,7 +1438,6 @@
14441438
environment:
14451439
CEPHADM_IMAGE: '{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}'
14461440

1447-
14481441
- name: Adjust placement daemons
14491442
hosts: "{{ mon_group_name|default('mons') }}[0]"
14501443
become: true
@@ -1506,7 +1499,7 @@
15061499
fsid: "{{ fsid }}"
15071500
cluster: "{{ cluster }}"
15081501
spec: |
1509-
service_name: prometheus
1502+
service_type: prometheus
15101503
service_id: "{{ ansible_facts['hostname'] }}"
15111504
placement:
15121505
label: {{ monitoring_group_name }}

0 commit comments

Comments
 (0)