Unify style of 'wait_for' action syntax across playbooks

ansible/boot_onie.yml

@@ -28,37 +28,41 @@
 
     - name: Wait for switch to come back (to ONIE)
       local_action:
-        wait_for host={{ real_ansible_host }}
-        port=22
-        state=started
-        delay=60
-        timeout=300
+        wait_for:
+          host: "{{ real_ansible_host }}"
+          port: 22
+          state: started
+          delay: 60
+          timeout: 300
       become: false
       changed_when: false
 
     - name: Wait for switch to reboot again
       local_action:
-        wait_for host={{ real_ansible_host }}
-        port=22
-        state=stopped
-        delay=5
-        timeout=600
+        wait_for:
+          host: "{{ real_ansible_host }}"
+          port: 22
+          state: stopped
+          delay: 5
+          timeout: 600
       become: false
       changed_when: false
 
     - name: Wait for switch to come back (to SONiC)
       local_action:
-        wait_for host={{ real_ansible_host }}
-        port=22
-        state=started
-        delay=30
-        timeout=600
-        search_regex=OpenSSH
+        wait_for:
+          host: "{{ real_ansible_host }}"
+          port: 22
+          state: started
+          search_regex: "OpenSSH"
+          delay: 30
+          timeout: 600
       become: false
       changed_when: false
 
     - name: Wait for the SONiC initialization process
-      pause: seconds=60
+      pause:
+        seconds: 60
 
     - name: Set all bgp interfaces admin-up
       become: true

ansible/roles/sonic-common/tasks/main.yml

@@ -243,7 +243,13 @@
   tags: unsafe
 
 - name: After rebooting, wait for switch to come back
-  local_action: wait_for host={{ inventory_hostname }} port=22 state=started delay=30 timeout=300
+  local_action:
+    wait_for:
+      host: "{{ inventory_hostname }}"
+      port: 22
+      state: started
+      delay: 30
+      timeout: 300
   become: false
   when: reboot_required is defined
   tags: unsafe

ansible/roles/test/tasks/common_tasks/reboot_sonic.yml

@@ -9,12 +9,13 @@
 
 - name: Wait for switch to come back
   local_action:
-    wait_for host={{ ansible_host }}
-    port=22
-    state=started
-    delay=10
-    timeout=180
-    search_regex="OpenSSH_[\w\.]+ Debian"
+    wait_for:
+      host: "{{ ansible_host }}"
+      port: 22
+      state: started
+      search_regex: "OpenSSH_[\w\.]+ Debian"
+      delay: 10
+      timeout: 180
   become: false
   changed_when: false
 

ansible/roles/test/tasks/saiserver.yml

@@ -26,7 +26,8 @@
   when: no_deploy_saiserver is not defined
 
 - name: Wait to make sure saiserver is started
-  wait_for: timeout=20
+  wait_for:
+    timeout: 20
 
 - name: Run SAI Test
   shell: ptf --test-dir /usr/share/ptf-tests {{ tests | default ("")}} -t "server='{{ ansible_host }}';port_map_file='/etc/ptf/default_interface_to_front_map.ini'" --platform remote {{ extra_options | default("")}} 2>&1

ansible/roles/test/tasks/service_acl.yml

@@ -31,12 +31,12 @@
 # Note that the timeout here should be sufficiently long enough to allow
 # config_service_acls.sh to apply the new service ACLs
 - name: Ensure the SSH port on the DuT becomes closed to us
-  wait_for:
-    port: 22
-    state: stopped
-    host: "{{ ansible_host }}"
-    timeout: 15
-  connection: local
+  local_action:
+    wait_for:
+      host: "{{ ansible_host }}"
+      port: 22
+      state: stopped
+      timeout: 15
 
 # Gather facts with SNMP version 2
 - name: Ensure attempt to gather basic SNMP facts about the device now times out
@@ -51,13 +51,13 @@
 # Note that the timeout here should be sufficiently long enough to allow
 # config_service_acls.sh to reset the ACLs to their original configuration
 - name: Wait until the original service ACLs are reinstated and the SSH port on the DUT is open to us once again
-  wait_for:
-    port: 22
-    state: started
-    host: "{{ ansible_host }}"
-    search_regex: "OpenSSH"
-    timeout: 60
-  connection: local
+  local_action:
+    wait_for:
+      host: "{{ ansible_host }}"
+      port: 22
+      state: started
+      search_regex: "OpenSSH"
+      timeout: 60
 
 - name: Delete config_service_acls.sh from the DuT
   become: true

ansible/roles/test/tasks/syslog.yml

@@ -91,7 +91,8 @@
   service: name=rsyslog state=started
 
 - name: Wait a little bit for service to start
-  wait_for: timeout=2
+  wait_for:
+    timeout: 2
 
 # SSH to device and generate a syslog
 - name: Send test syslog

ansible/upgrade_sonic.yml

@@ -32,11 +32,12 @@
 
         - name: Wait for switch to come back (to ONIE)
           local_action:
-            wait_for host={{ real_ansible_host }}
-            port=22
-            state=started
-            delay=60
-            timeout=300
+            wait_for:
+              host: "{{ real_ansible_host }}"
+              port: 22
+              state: started
+              delay: 60
+              timeout: 300
           changed_when: false
 
         - name: Stop onie discovery
@@ -55,11 +56,12 @@
 
         - name: Wait for switch to reboot again (ONIE installation finishes)
           local_action:
-            wait_for host={{ real_ansible_host }}
-            port=22
-            state=stopped
-            delay=5
-            timeout=600
+            wait_for:
+              host: "{{ real_ansible_host }}"
+              port: 22
+              state: stopped
+              delay: 5
+              timeout: 600
           changed_when: false
 
       when: upgrade_type == "onie"
@@ -85,12 +87,13 @@
 
     - name: Wait for switch {{ inventory_hostname }} to come back (to SONiC)
       local_action:
-        wait_for host={{ ansible_host }}
-        port=22
-        state=started
-        delay=30
-        timeout=600
-        search_regex=OpenSSH
+        wait_for:
+          host: "{{ real_ansible_host }}"
+          port: 22
+          state: started
+          search_regex: "OpenSSH"
+          delay: 30
+          timeout: 600
       changed_when: false
 
     - name: Wait for SONiC initialization