Fix osd disk weight check command
When performed check for current value of disk weight print only it's
current value from 'osd tree' output, to avoid issues with matching osd
numbers. Also match disk weight as fixed string and complete word.
Related-Prod: PROD-35840
Change-Id: Iac36dcb83c97c8e7b3ca8b980f02f02471b699cf
diff --git a/ceph/osd/custom.sls b/ceph/osd/custom.sls
index a004663..8748422 100644
--- a/ceph/osd/custom.sls
+++ b/ceph/osd/custom.sls
@@ -35,7 +35,7 @@
update_weight_disk_{{ dev }}:
cmd.run:
- name: "ceph -c /etc/ceph/{{ common.get('cluster_name', 'ceph') }}.conf osd crush reweight osd.{{ disk_id }} {{ disk.weight }}"
- - unless: "ceph -c /etc/ceph/{{ common.get('cluster_name', 'ceph') }}.conf osd tree | awk '{print $2,$3,$4}' | grep -w osd.{{ disk_id }} | grep {{ disk.weight }}"
+ - unless: "ceph -c /etc/ceph/{{ common.get('cluster_name', 'ceph') }}.conf osd tree | awk '{print $2,$3,$4}' | grep -w osd.{{ disk_id }} | awk '{print $2}' | grep -wF {{ disk.weight }}"
{%- if grains.get('noservices') %}
- onlyif: /bin/false
{%- endif %}