diff --git a/tasks/persistent_cloud_new.yml b/tasks/persistent_cloud_new.yml
index b927b98d3b..12e1b9a3aa 100644
--- a/tasks/persistent_cloud_new.yml
+++ b/tasks/persistent_cloud_new.yml
@@ -37,40 +37,22 @@
 
 - name: wait for he host to be hot
   local_action: wait_for host={{ public_ip }} port=22 delay=1 timeout=600
-
+  when: host_is_up|failed
 
 # Check is failing on the lockbox, something with ssh identity available for ssh invocation through the shell module,
+# see: http://fpaste.org/206551/
+- name: waiting for cloud-init
+  pause: seconds=30
+  when: host_is_up|failed
+
 ## We need to specify user, here we trying with fedora or root
-- name: debug ansible local action
-  local_action: shell echo $SSH_AUTH_SOCK
-  ignore_errors: True
-  register: fooa
-
-- debug: msg="{{ fooa.stdout }}"
-
-- name: debug ansible local action 2
-  local_action: shell env
-  ignore_errors: True
-  register: foob
-
-- debug: msg="{{ foob.stdout }}"
-
-- name: debug ansible local action 3
-  local_action: command env
-  ignore_errors: True
-  register: fooc
-
-- debug: msg="{{ fooc.stdout }}"
-
-- name: wait until ssh is available
-  # local_action:  shell false; until [ "$?" -eq "0" ]; do sleep 2; ssh -o PasswordAuthentication=no fedora@{{ public_ip }} 'echo foobar'  || ssh -o PasswordAuthentication=no root@{{ public_ip }} 'echo foobar'; done
-  # local_action: shell false; until [ "$?" -eq "0" ]; do sleep 2; ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no fedora@{{ public_ip }} 'echo foobar'; done
-  local_action: shell whoami && ssh -vvvv -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no fedora@{{ public_ip }} 'echo foobar'
-  # async: 20
-  # poll: 5
-  # register: ssh_check
-  ignore_errors: True
-
-#- debug: msg="{{ ssh_check }}"
+#- name: wait until ssh is available
+#  # local_action:  shell false; until [ "$?" -eq "0" ]; do sleep 2; ssh -o PasswordAuthentication=no fedora@{{ public_ip }} 'echo foobar'  || ssh -o PasswordAuthentication=no root@{{ public_ip }} 'echo foobar'; done
+#  # local_action: shell false; until [ "$?" -eq "0" ]; do sleep 2; ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no fedora@{{ public_ip }} 'echo foobar'; done
+#  local_action: shell whoami && ssh -vvvv -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no fedora@{{ public_ip }} 'echo foobar'
+#  # async: 20
+#  # poll: 5
+#  ignore_errors: True
+