Fix retries keyword missing until instruction (#5989)

roles/network_plugin/calico/tasks/install.yml

@@ -89,6 +89,7 @@
     {{ bin_dir }}/calicoctl.sh get ippool | grep -w "{{ calico_pool_cidr | default(kube_pods_subnet) }}" | wc -l
   register: calico_conf
   retries: 4
+  until: calico_conf.rc == 0
   delay: "{{ retry_stagger | random + 3 }}"
   changed_when: false
   when:
@@ -203,7 +204,9 @@
        "asNumber": "{{ item.as }}",
        "peerIP": "{{ item.router_id }}"
     }}' | {{ bin_dir }}/calicoctl.sh apply -f -
+  register: output
   retries: 4
+  until: output.rc == 0
   delay: "{{ retry_stagger | random + 3 }}"
   with_items:
     - "{{ peers|selectattr('scope','defined')|selectattr('scope','equalto', 'global')|list|default([]) }}"
@@ -223,7 +226,9 @@
        "nodeSelector": "!has(i-am-a-route-reflector)",
        "peerSelector": "has(i-am-a-route-reflector)"
     }}' | {{ bin_dir }}/calicoctl.sh apply -f -
+  register: output
   retries: 4
+  until: output.rc == 0
   delay: "{{ retry_stagger | random + 3 }}"
   with_items:
     - "{{ groups['calico-rr'] | default([]) }}"
@@ -243,7 +248,9 @@
        "nodeSelector": "has(i-am-a-route-reflector)",
        "peerSelector": "has(i-am-a-route-reflector)"
     }}' | {{ bin_dir }}/calicoctl.sh apply -f -
+  register: output
   retries: 4
+  until: output.rc == 0
   delay: "{{ retry_stagger | random + 3 }}"
   with_items:
     - "{{ groups['calico-rr'] | default([]) }}"
@@ -316,7 +323,9 @@
        },
        "orchRefs":[{"nodeName":"{{ inventory_hostname }}","orchestrator":"k8s"}]
     }}' | {{ bin_dir }}/calicoctl.sh apply -f -
+  register: output
   retries: 4
+  until: output.rc == 0
   delay: "{{ retry_stagger | random + 3 }}"
   when:
     - peer_with_router|default(false)
@@ -337,7 +346,9 @@
        "node": "{{ inventory_hostname }}",
        "peerIP": "{{ item.router_id }}"
     }}' | {{ bin_dir }}/calicoctl.sh apply -f -
+  register: output
   retries: 4
+  until: output.rc == 0
   delay: "{{ retry_stagger | random + 3 }}"
   with_items:
     - "{{ peers|selectattr('scope','undefined')|list|default([]) | union(peers|selectattr('scope','defined')|selectattr('scope','equalto', 'node')|list|default([])) }}"

roles/network_plugin/canal/tasks/main.yml

@@ -31,7 +31,9 @@
     {{ bin_dir }}/etcdctl --peers={{ etcd_access_addresses }} \
     set /{{ cluster_name }}/network/config \
     '{ "Network": "{{ kube_pods_subnet }}", "SubnetLen": {{ kube_network_node_prefix }}, "Backend": { "Type": "{{ flannel_backend_type }}" } }'
+  register: output
   retries: 4
+  until: output.rc == 0
   delay: "{{ retry_stagger | random + 3 }}"
   delegate_to: "{{ groups['etcd'][0] }}"
   changed_when: false