Update ansible setup.

Signed-off-by: Lantao Liu <lantaol@google.com>
klihub · Mar 6, 2018 · 640e7ac · 640e7ac
1 parent 936dcce
commit 640e7ac
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 38 deletions.
diff --git a/contrib/ansible/README.md b/contrib/ansible/README.md
@@ -1,4 +1,4 @@
-# Kubernetes Cluster with Containerd and CRI-Containerd
+# Kubernetes Cluster with Containerd
 <p align="center">
 <img src="https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png" width="50" height="50">
 <img src="https://github.com/containerd/containerd/blob/master/docs/images/containerd-dark.png" width="200" >

diff --git a/contrib/ansible/cri-containerd.yaml b/contrib/ansible/cri-containerd.yaml
@@ -8,7 +8,7 @@
     - include_tasks: tasks/bootstrap_centos.yaml # Contains tasks bootstrap components for centos systems
       when: ansible_distribution == "CentOS"
     - include_tasks: tasks/k8s.yaml # Contains tasks kubernetes component installation
-    - include_tasks: tasks/binaries.yaml # Contains tasks for pulling containerd and cri-containerd components
+    - include_tasks: tasks/binaries.yaml # Contains tasks for pulling containerd components
 
     - name: "Create a directory for containerd config"
       file: path=/etc/containerd state=directory
@@ -21,22 +21,9 @@
           [cgroup]
             path = "/runtime"
 
-    - name: "Create a directory for cri-containerd config"
-      file: path=/etc/cri-containerd state=directory
-
-    - name: "Add cri-containerd config file"
-      blockinfile:
-        path: /etc/cri-containerd/config.toml
-        create: yes
-        block: |
-          cgroup_path = "/runtime"
-
     - name: "Start Containerd"
       systemd: name=containerd daemon_reload=yes state=started enabled=yes
 
-    - name: "Start CRI-Containerd"
-      systemd: name=cri-containerd daemon_reload=yes state=started enabled=yes
-
     - name: "Load br_netfilter kernel module"
       modprobe:
         name: br_netfilter
@@ -59,7 +46,7 @@
     - name: "Add runtime args in kubelet conf"
       lineinfile:
         dest: "/etc/systemd/system/kubelet.service.d/10-kubeadm.conf"
-        line: "Environment=\"KUBELET_EXTRA_ARGS= --runtime-cgroups=/runtime --container-runtime=remote --runtime-request-timeout=15m --container-runtime-endpoint=/var/run/cri-containerd.sock\""
+        line: "Environment=\"KUBELET_EXTRA_ARGS= --runtime-cgroups=/runtime --container-runtime=remote --runtime-request-timeout=15m --container-runtime-endpoint=/run/containerd/containerd.sock\""
         insertafter: '\[Service\]'
       when: check_args.stdout == ""
 
@@ -70,5 +57,5 @@
     - name: "Pre-pull pause container image"
       shell: |
         /usr/local/bin/ctr pull gcr.io/google_containers/pause:3.0
-        /usr/local/bin/crictl --runtime-endpoint /var/run/cri-containerd.sock \
+        /usr/local/bin/crictl --runtime-endpoint /run/containerd/containerd.sock \
         pull gcr.io/google_containers/pause:3.0
diff --git a/contrib/ansible/tasks/binaries.yaml b/contrib/ansible/tasks/binaries.yaml
@@ -1,5 +1,5 @@
 ---
-- name: "Get Containerd and CRI-Containerd"
+- name: "Get Containerd"
   unarchive:
     src: "https://storage.googleapis.com/cri-containerd-release/cri-containerd-{{ cri_containerd_release_version }}.linux-amd64.tar.gz"
     dest: "/"

diff --git a/contrib/ansible/vars/vars.yaml b/contrib/ansible/vars/vars.yaml
@@ -1,7 +1,4 @@
 ---
 cri_containerd_release_version: 1.0.0-beta.0
-cri_release_directory: /opt/cri-containerd/
-local_bin_dir: /usr/local/bin/
-local_sbin_dir: /usr/local/sbin/
 cni_bin_dir: /opt/cni/bin/
 cni_conf_dir: /etc/cni/net.d/
diff --git a/contrib/systemd-units/cri-containerd.service b/contrib/systemd-units/cri-containerd.service