diff --git a/playbooks/os-ceilometer-install.yml b/playbooks/os-ceilometer-install.yml
index 52b02dc7dd..cab07fe313 100644
--- a/playbooks/os-ceilometer-install.yml
+++ b/playbooks/os-ceilometer-install.yml
@@ -39,6 +39,9 @@
         search_regex: "OpenSSH"
         host: "{{ ansible_ssh_host }}"
       delegate_to: "{{ physical_host }}"
+      register: ssh_wait_check
+      until: ssh_wait_check|success
+      retries: 3
       tags:
         - ssh-wait
     - name: Sort the rabbitmq servers
diff --git a/playbooks/os-glance-install.yml b/playbooks/os-glance-install.yml
index 32d5fbf703..5005d4d4fd 100644
--- a/playbooks/os-glance-install.yml
+++ b/playbooks/os-glance-install.yml
@@ -50,6 +50,9 @@
         search_regex: "OpenSSH"
         host: "{{ ansible_ssh_host }}"
       delegate_to: "{{ physical_host }}"
+      register: ssh_wait_check
+      until: ssh_wait_check|success
+      retries: 3
       tags:
         - ssh-wait
     - name: Sort the rabbitmq servers
diff --git a/playbooks/os-neutron-install.yml b/playbooks/os-neutron-install.yml
index d81770d10c..4371c7703e 100644
--- a/playbooks/os-neutron-install.yml
+++ b/playbooks/os-neutron-install.yml
@@ -55,6 +55,9 @@
         search_regex: "OpenSSH"
         host: "{{ ansible_ssh_host }}"
       delegate_to: "{{ physical_host }}"
+      register: ssh_wait_check
+      until: ssh_wait_check|success
+      retries: 3
       tags:
         - ssh-wait
     - name: Sort the rabbitmq servers
diff --git a/playbooks/repo-server.yml b/playbooks/repo-server.yml
index 50c7d738e7..2ed4681fa5 100644
--- a/playbooks/repo-server.yml
+++ b/playbooks/repo-server.yml
@@ -50,6 +50,9 @@
         search_regex: "OpenSSH"
         host: "{{ ansible_ssh_host }}"
       delegate_to: "{{ physical_host }}"
+      register: ssh_wait_check
+      until: ssh_wait_check|success
+      retries: 3
       tags:
         - ssh-wait
   roles: