Fixed merge conflicts.

contrib/ansible/cri-containerd.yaml

@@ -1,9 +1,9 @@
 ---
-- hosts: all 
+- hosts: all
   become: true
   tasks:
     - include_vars: vars/vars.yaml # Contains tasks variables for installer
-    - include_tasks: tasks/bootstrap_ubuntu.yaml # Contains tasks bootstrap components for ubuntu systems 
+    - include_tasks: tasks/bootstrap_ubuntu.yaml # Contains tasks bootstrap components for ubuntu systems
       when: ansible_distribution == "Ubuntu"
     - include_tasks: tasks/bootstrap_centos.yaml # Contains tasks bootstrap components for centos systems
       when: ansible_distribution == "CentOS"
@@ -21,12 +21,12 @@
         name: br_netfilter
         state: present
 
-    - name: "Set bridge-nf-call-iptables" 
+    - name: "Set bridge-nf-call-iptables"
       sysctl:
         name: net.bridge.bridge-nf-call-iptables
         value: 1
 
-    - name: "Set ip_forward" 
+    - name: "Set ip_forward"
       sysctl:
         name: net.ipv4.ip_forward
         value: 1
@@ -57,10 +57,10 @@
 
     - name: "Start Kubelet"
       systemd: name=kubelet daemon_reload=yes state=started enabled=yes
-    
+
     # TODO This needs to be removed once we have consistent concurrent pull results
     - name: "Pre-pull pause container image"
       shell: |
-        /usr/local/bin/ctr pull k8s.gcr.io/pause:3.1
+        /usr/local/bin/ctr pull k8s.gcr.io/pause:3.2
         /usr/local/bin/crictl --runtime-endpoint unix:///run/containerd/containerd.sock \
-        pull k8s.gcr.io/pause:3.1
+        pull k8s.gcr.io/pause:3.2