fix grep match pattern for osd ids

Some playbooks use [0-9]*, others use \d+$
The latter is more correct since cluster name may contain numbers.

Signed-off-by: Shengjing Zhu <zsj950618@gmail.com>

diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml
index f27925834afee54e90fb73627595205c3c79edbe..8bd1471eb438caddac193e653d879f1e9a4ab3e5 100644 (file)
--- a/infrastructure-playbooks/purge-cluster.yml
+++ b/infrastructure-playbooks/purge-cluster.yml
@@ -234,7 +234,7 @@
 
   - name: stop ceph osds on ubuntu
     shell: |
-      for id in $(ls /var/lib/ceph/osd/ |grep -oh '[0-9]*'); do
+      for id in $(ls /var/lib/ceph/osd/ |grep -oP '\d+$'); do
         initctl stop ceph-osd cluster={{ cluster }} id=$id
       done
     failed_when: false

diff --git a/roles/ceph-common/handlers/restart-osd.yml b/roles/ceph-common/handlers/restart-osd.yml
index dc6fbeebb146b8fe4eefdbe11093e8340547f471..ad2fd4ffc1a1006c66f79958618e25b0e466ee6a 100644 (file)
--- a/roles/ceph-common/handlers/restart-osd.yml
+++ b/roles/ceph-common/handlers/restart-osd.yml
@@ -4,7 +4,7 @@
 # for restarting them specifically.
 - name: restart ceph osds
   shell: |
-    for id in $(ls /var/lib/ceph/osd/ |grep -oh '[0-9]*'); do
+    for id in $(ls /var/lib/ceph/osd/ |grep -oP '\d+$'); do
       systemctl restart ceph-osd@$id
       sleep 5
     done

diff --git a/roles/ceph-common/handlers/validate-osd.yml b/roles/ceph-common/handlers/validate-osd.yml
index 99d1c2f871d09e5100ed5795ce8fc6abf5c7f4a8..88881212c11a60ee3b594bfb97c0bf4c943f875f 100644 (file)
--- a/roles/ceph-common/handlers/validate-osd.yml
+++ b/roles/ceph-common/handlers/validate-osd.yml
@@ -1,7 +1,7 @@
 ---
 - name: collect osds
   shell: |
-    ls /var/lib/ceph/osd/ |grep -oh '[0-9]*'
+    ls /var/lib/ceph/osd/ |grep -oP '\d+$'
   register: osd_ids
 
 - name: wait for ceph osd socket(s)