]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
purge-cluster: check if rbdmap exists
authorBenoît Knecht <bknecht@protonmail.ch>
Fri, 31 Jul 2020 06:11:31 +0000 (08:11 +0200)
committerGuillaume Abrioux <gabrioux@redhat.com>
Thu, 6 Aug 2020 07:35:03 +0000 (09:35 +0200)
When running `infrastructure-playbooks/purge-cluster.yml` twice, it fails the
second time on the `ensure rbd devices are unmapped` task, because `rbdmap`
isn't installed anymore at that point.

This commit adds a check that ensures `rbdmap` is available, and skips the
`ensure rbd devices are unmapped` task if it isn't.

Signed-off-by: Benoît Knecht <bknecht@protonmail.ch>
infrastructure-playbooks/purge-cluster.yml

index 36953cec9ce039c82aa47060d65914262dbddc03..21c1dad0b5afc1f4b1693e7d3e52ad6887b56187 100644 (file)
     - name: ensure cephfs mountpoint(s) are unmounted
       command: umount -a -t ceph
 
+    - name: check if rbdmap is still installed
+      command: command -v rbdmap
+      register: command_rbdmap
+      failed_when: false
+      changed_when: false
+
     - name: ensure rbd devices are unmapped
       command: rbdmap unmap-all
+      when: command_rbdmap.rc == 0
 
     - name: unload ceph kernel modules
       modprobe: