fix unless attribute in ceph-disk based setup
Related-Prod: PROD-34415
Change-Id: I070115b13f380eacaa663ea95b17614fee7c41e5
diff --git a/ceph/osd/setup/disk.sls b/ceph/osd/setup/disk.sls
index 5b1a832..cbde43f 100644
--- a/ceph/osd/setup/disk.sls
+++ b/ceph/osd/setup/disk.sls
@@ -43,8 +43,8 @@
zap_disk_journal_{{ disk.journal }}_for_{{ dev_device }}:
cmd.run:
- - name: "ceph-disk zap {{ disk.journal }}"
- - unless: "ceph-disk list | grep {{ disk.journal }} | grep -e 'ceph' -e 'mounted'"
+ - name: "ceph-disk zap `readlink -f {{ disk.journal }}`"
+ - unless: "ceph-disk list | grep `readlink -f {{ disk.journal }}` | grep -e 'ceph' -e 'mounted'"
- require:
- pkg: ceph_osd_packages
- file: /etc/ceph/{{ common.get('cluster_name', 'ceph') }}.conf
@@ -59,8 +59,8 @@
zap_disk_blockdb_{{ disk.block_db }}_for_{{ dev_device }}:
cmd.run:
- - name: "ceph-disk zap {{ disk.block_db }}"
- - unless: "ceph-disk list | grep {{ disk.block_db }} | grep -e 'ceph' -e 'mounted'"
+ - name: "ceph-disk zap `readlink -f {{ disk.block_db }}`"
+ - unless: "ceph-disk list | grep `readlink -f {{ disk.block_db }}` | grep -e 'ceph' -e 'mounted'"
- require:
- pkg: ceph_osd_packages
- file: /etc/ceph/{{ common.get('cluster_name', 'ceph') }}.conf
@@ -75,8 +75,8 @@
zap_disk_blockwal_{{ disk.block_wal }}_for_{{ dev_device }}:
cmd.run:
- - name: "ceph-disk zap {{ disk.block_wal }}"
- - unless: "ceph-disk list | grep {{ disk.block_wal }} | grep -e 'ceph' -e 'mounted'"
+ - name: "ceph-disk zap `readlink -f {{ disk.block_wal }}`"
+ - unless: "ceph-disk list | grep `readlink -f {{ disk.block_wal }}` | grep -e 'ceph' -e 'mounted'"
- require:
- pkg: ceph_osd_packages
- file: /etc/ceph/{{ common.get('cluster_name', 'ceph') }}.conf