From: Benoît Knecht <bknecht@protonmail.ch>
Date: Fri, 3 Jan 2020 09:38:20 +0000 (+0100)
Subject: infrastructure-playbooks: Run shrink-osd tasks on monitor
X-Git-Tag: v6.0.0alpha1~52
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8b3df4e4180c90141b3fc8ca25573171eb45bb0a;p=ceph-ansible.git

infrastructure-playbooks: Run shrink-osd tasks on monitor

Instead of running shring-osd tasks on localhost and delegating most of
them to the first monitor, run all of them on the first monitor
directly.

This has the added advantage of becoming root on the monitor only, not
on localhost.

Signed-off-by: Benoît Knecht <bknecht@protonmail.ch>
---

diff --git a/infrastructure-playbooks/shrink-osd.yml b/infrastructure-playbooks/shrink-osd.yml
index 9867b06b0..466422736 100644
--- a/infrastructure-playbooks/shrink-osd.yml
+++ b/infrastructure-playbooks/shrink-osd.yml
@@ -23,7 +23,7 @@
 
 - name: confirm whether user really meant to remove osd(s) from the cluster
 
-  hosts: localhost
+  hosts: "{{ groups[mon_group_name][0] }}"
 
   become: true
 
@@ -71,14 +71,12 @@
       command: "{{ container_exec_cmd }} timeout 5 ceph --cluster {{ cluster }} health"
       register: ceph_health
       until: ceph_health.stdout.find("HEALTH") > -1
-      delegate_to: "{{ groups[mon_group_name][0] }}"
       retries: 5
       delay: 2
 
     - name: find the host(s) where the osd(s) is/are running on
       command: "{{ container_exec_cmd }} ceph --cluster {{ cluster }} osd find {{ item }}"
       with_items: "{{ osd_to_kill.split(',') }}"
-      delegate_to: "{{ groups[mon_group_name][0] }}"
       register: find_osd_hosts
 
     - name: set_fact osd_hosts
@@ -97,7 +95,6 @@
     - name: mark osd(s) out of the cluster
       command: "{{ container_exec_cmd }} ceph --cluster {{ cluster }} osd out {{ osd_to_kill.replace(',', ' ') }}"
       run_once: true
-      delegate_to: "{{ groups[mon_group_name][0] }}"
 
     - name: stop osd(s) service
       service:
@@ -121,13 +118,10 @@
     - name: purge osd(s) from the cluster
       command: "{{ container_exec_cmd }} ceph --cluster {{ cluster }} osd purge {{ item }} --yes-i-really-mean-it"
       run_once: true
-      delegate_to: "{{ groups[mon_group_name][0] }}"
       with_items: "{{ osd_to_kill.split(',') }}"
 
     - name: show ceph health
       command: "{{ container_exec_cmd }} ceph --cluster {{ cluster }} -s"
-      delegate_to: "{{ groups[mon_group_name][0] }}"
 
     - name: show ceph osd tree
       command: "{{ container_exec_cmd }} ceph --cluster {{ cluster }} osd tree"
-      delegate_to: "{{ groups[mon_group_name][0] }}"