making vagrant up work

diff --git a/group_vars/all b/group_vars/all
index b5d2708bb87882c57fa7420ee9ad33c55e787f6b..bac661c30dad6741f6514c838e47b426f8d1b85e 100644 (file)
--- a/group_vars/all
+++ b/group_vars/all
@@ -16,7 +16,7 @@ dummy:
 
 ## Monitor options
 #
-#monitor_interface: eth1
+monitor_interface: eth1
 #mon_osd_down_out_interval: 600
 #mon_osd_min_down_reporters: 7 # number of OSDs per host + 1
 

diff --git a/roles/ceph-mon/tasks/main.yml b/roles/ceph-mon/tasks/main.yml
index f64c1ef9d2414fcfd70c97aaaeb37241973a0c82..12fad8a0ec7ebe482c7cb1afd54ea9073b89b36b 100644 (file)
--- a/roles/ceph-mon/tasks/main.yml
+++ b/roles/ceph-mon/tasks/main.yml
@@ -3,11 +3,14 @@
 
 # Wait for mon discovery and quorum resolution
 # the admin key is not instantanely created so we have to wait a bit
-- name: If client.admin key exists
-  command: stat /etc/ceph/ceph.client.admin.keyring
-  register: result
-  until: result.rc == 0
-  changed_when: False
+#- name: If client.admin key exists
+#  command: stat /etc/ceph/ceph.client.admin.keyring
+#  register: result
+#  until: result.rc == 0
+#  changed_when: False
+
+- name: wait for client.admin key exists
+  wait_for: path=/etc/ceph/ceph.client.admin.keyring
 
 - name: Create RGW keyring
   command: ceph auth get-or-create client.radosgw.gateway osd 'allow rwx' mon 'allow rw' -o /etc/ceph/keyring.radosgw.gateway creates=/etc/ceph/keyring.radosgw.gateway