aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2016-01-30 06:14:08 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-30 06:14:09 +0000
commit25aa10c2da1ab23873314e8c6bf6897982ab4bc5 (patch)
tree6549c67c808d5062238eef90f786dacbb4b33649
parent3fe5c29ede14c9a5d530054d6a4858377d5e3e63 (diff)
parentcb3d982b9c70e86dbe489c9eddfa40f2e563e224 (diff)
Merge "Use wait_for instead of sleep to fetch keyring" into stable/brahmaputra
-rw-r--r--deploy/adapters/ansible/roles/ceph-mon/tasks/install_mon.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/deploy/adapters/ansible/roles/ceph-mon/tasks/install_mon.yml b/deploy/adapters/ansible/roles/ceph-mon/tasks/install_mon.yml
index e677513..279eb78 100644
--- a/deploy/adapters/ansible/roles/ceph-mon/tasks/install_mon.yml
+++ b/deploy/adapters/ansible/roles/ceph-mon/tasks/install_mon.yml
@@ -22,8 +22,8 @@
- name: auto start ceph-mon
file: path="/var/lib/ceph/mon/ceph-{{ inventory_hostname }}/upstart" state="touch"
-- name: sleep for creating osd keyring
- shell: sleep 10
+- name: wait for creating osd keyring
+ wait_for: path=/var/lib/ceph/bootstrap-osd/ceph.keyring
- name: fetch osd keyring
fetch: src="/var/lib/ceph/bootstrap-osd/ceph.keyring" dest="/tmp/ceph.osd.keyring" flat=yes