Merge "Add configurable ssh_delay"

etc/openstack_deploy/user_variables.yml

@@ -149,3 +149,8 @@ ssl_cipher_suite: "ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AE
 # horizon_available_regions:
 #   - { url: "{{ keystone_service_internalurl }}", name: "{{ keystone_service_region }}" }
 #   - { url: "http://cluster1.example.com:5000/v2.0", name: "RegionTwo" }
+
+## SSH connection wait time
+# If an increased delay for the ssh connection check is desired,
+# uncomment this variable and set it appropriately.
+#ssh_delay: 5

playbooks/galera-install.yml

@@ -86,7 +86,7 @@
     - name: Wait for container ssh
       wait_for:
         port: "22"
-        delay: 5
+        delay: "{{ ssh_delay }}"
         search_regex: "OpenSSH"
         host: "{{ ansible_ssh_host }}"
       delegate_to: "{{ physical_host }}"

playbooks/inventory/group_vars/hosts.yml

@@ -18,6 +18,10 @@ debug: False
 verbose: True
 
 
+## SSH connection wait time
+ssh_delay: 5
+
+
 ## Repo server
 repo_service_user_name: nginx
 repo_service_home_folder: /var/www

playbooks/os-ceilometer-install.yml

@@ -26,7 +26,7 @@
     - name: Wait for container ssh
       wait_for:
         port: "22"
-        delay: 5
+        delay: "{{ ssh_delay }}"
         search_regex: "OpenSSH"
         host: "{{ ansible_ssh_host }}"
       delegate_to: "{{ physical_host }}"

playbooks/os-cinder-install.yml

@@ -76,7 +76,7 @@
     - name: Wait for container ssh
       wait_for:
         port: "22"
-        delay: 5
+        delay: "{{ ssh_delay }}"
         search_regex: "OpenSSH"
         host: "{{ ansible_ssh_host }}"
       delegate_to: "{{ physical_host }}"

playbooks/os-glance-install.yml

@@ -37,7 +37,7 @@
     - name: Wait for container ssh
       wait_for:
         port: "22"
-        delay: 5
+        delay: "{{ ssh_delay }}"
         search_regex: "OpenSSH"
         host: "{{ ansible_ssh_host }}"
       delegate_to: "{{ physical_host }}"

playbooks/os-neutron-install.yml

@@ -39,7 +39,7 @@
     - name: Wait for container ssh
       wait_for:
         port: "22"
-        delay: 5
+        delay: "{{ ssh_delay }}"
         search_regex: "OpenSSH"
         host: "{{ ansible_ssh_host }}"
       delegate_to: "{{ physical_host }}"

playbooks/repo-server.yml

@@ -37,7 +37,7 @@
     - name: Wait for container ssh
       wait_for:
         port: "22"
-        delay: 5
+        delay: "{{ ssh_delay }}"
         search_regex: "OpenSSH"
         host: "{{ ansible_ssh_host }}"
       delegate_to: "{{ physical_host }}"

playbooks/rsyslog-install.yml

@@ -45,7 +45,7 @@
     - name: Wait for container ssh
       wait_for:
         port: "22"
-        delay: 5
+        delay: "{{ ssh_delay }}"
         search_regex: "OpenSSH"
         host: "{{ ansible_ssh_host }}"
       delegate_to: "{{ physical_host }}"