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>
pull/1316/head
Shengjing Zhu 2017-02-20 16:35:56 +08:00
parent 95bece97e5
commit 32923fd217
3 changed files with 3 additions and 3 deletions

View File

@ -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

View File

@ -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

View File

@ -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)