diff --git a/infrastructure-playbooks/lv-teardown.yml b/infrastructure-playbooks/lv-teardown.yml index cab24250a..d06652d5a 100644 --- a/infrastructure-playbooks/lv-teardown.yml +++ b/infrastructure-playbooks/lv-teardown.yml @@ -33,7 +33,9 @@ # BEGIN TEARDOWN - name: find any existing osd filesystems - shell: "grep /var/lib/ceph/osd /proc/mounts | awk '{print $2}'" + shell: | + set -o pipefail; + grep /var/lib/ceph/osd /proc/mounts | awk '{print $2}' register: old_osd_filesystems - name: tear down any existing osd filesystems diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml index 75846a28e..d83c1472a 100644 --- a/infrastructure-playbooks/purge-cluster.yml +++ b/infrastructure-playbooks/purge-cluster.yml @@ -386,7 +386,9 @@ when: lvm_volumes is not defined - name: get osd numbers - shell: "if [ -d /var/lib/ceph/osd ] ; then ls /var/lib/ceph/osd | sed 's/.*-//' ; fi" + shell: | + set -o pipefail; + if [ -d /var/lib/ceph/osd ] ; then ls /var/lib/ceph/osd | sed 's/.*-//' ; fi register: osd_ids changed_when: false @@ -409,11 +411,15 @@ # NOTE(leseb): hope someone will find a more elegant way one day... - name: see if encrypted partitions are present shell: | + set -o pipefail; blkid -t TYPE=crypto_LUKS -s PARTLABEL -s PARTUUID | grep "ceph.*." | grep -o PARTUUID.* | cut -d '"' -f 2 register: encrypted_ceph_partuuid + failed_when: false - name: get osd data and lockbox mount points - shell: "(grep /var/lib/ceph/osd /proc/mounts || echo -n) | awk '{ print $2 }'" + shell: | + set -o pipefail; + (grep /var/lib/ceph/osd /proc/mounts || echo -n) | awk '{ print $2 }' register: mounted_osd changed_when: false @@ -455,7 +461,9 @@ when: encrypted_ceph_partuuid.stdout_lines | length > 0 - name: get payload_offset - shell: cryptsetup luksDump /dev/disk/by-partuuid/{{ item }} | awk '/Payload offset:/ { print $3 }' + shell: | + set -o pipefail; + cryptsetup luksDump /dev/disk/by-partuuid/{{ item }} | awk '/Payload offset:/ { print $3 }' register: payload_offset with_items: "{{ encrypted_ceph_partuuid.stdout_lines }}" when: encrypted_ceph_partuuid.stdout_lines | length > 0 @@ -563,12 +571,14 @@ - name: wipe partitions shell: | + set -o pipefail; wipefs --all "{{ item }}" dd if=/dev/zero of="{{ item }}" bs=1 count=4096 with_items: "{{ combined_devices_list }}" - name: zap ceph journal/block db/block wal partitions shell: | + set -o pipefail; # if the disk passed is a raw device AND the boot system disk if parted -s /dev/"{{ item }}" print | grep -sq boot; then echo "Looks like /dev/{{ item }} has a boot partition," diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml index 4e6e657df..1eadba755 100644 --- a/infrastructure-playbooks/rolling_update.yml +++ b/infrastructure-playbooks/rolling_update.yml @@ -365,7 +365,9 @@ name: ceph-facts - name: get osd numbers - non container - shell: "if [ -d /var/lib/ceph/osd ] ; then ls /var/lib/ceph/osd | sed 's/.*-//' ; fi" + shell: | + set -o pipefail; + if [ -d /var/lib/ceph/osd ] ; then ls /var/lib/ceph/osd | sed 's/.*-//' ; fi register: osd_ids changed_when: false diff --git a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml index 9c5f48fd6..6fd9c6ac6 100644 --- a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml +++ b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml @@ -235,6 +235,7 @@ - name: collect running osds shell: | + set -o pipefail; systemctl list-units | grep -E "loaded * active" | grep -Eo 'ceph-osd@[0-9]+.service|ceph-volume|ceph\.target' register: running_osds changed_when: false diff --git a/infrastructure-playbooks/take-over-existing-cluster.yml b/infrastructure-playbooks/take-over-existing-cluster.yml index c8e54d999..ddd6b2fd1 100644 --- a/infrastructure-playbooks/take-over-existing-cluster.yml +++ b/infrastructure-playbooks/take-over-existing-cluster.yml @@ -37,6 +37,7 @@ post_tasks: - name: get the name of the existing ceph cluster shell: | + set -o pipefail; basename $(grep --exclude '*.bak' -R fsid /etc/ceph/ | egrep -o '^[^.]*' | head -n 1) changed_when: false register: cluster_name