From 0ee33fda0324100ea1a2e337737fbf94cad70f10 Mon Sep 17 00:00:00 2001
From: Abhinandan Prativadi <abhi@docker.com>
Date: Mon, 25 Sep 2017 16:06:40 -0700
Subject: [PATCH] Combining few tasks into one

Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
---
 contrib/ansible/tasks/binaries.yaml | 47 ++---------------------------
 contrib/ansible/vars/vars.yaml      |  2 +-
 2 files changed, 3 insertions(+), 46 deletions(-)

diff --git a/contrib/ansible/tasks/binaries.yaml b/contrib/ansible/tasks/binaries.yaml
index c7f2306a8363..a13ddd85c11b 100644
--- a/contrib/ansible/tasks/binaries.yaml
+++ b/contrib/ansible/tasks/binaries.yaml
@@ -1,52 +1,9 @@
 ---
-- name: "Create a directory to download binaries"
-  file: path={{ cri_release_directory }} state=directory
-
 - name: "Get Containerd and CRI-Containerd"
-  get_url:
-    validate_certs: "no"
-    url: "https://storage.googleapis.com/cri-containerd-staging/cri-containerd-{{ cri_containerd_release_version }}.tar.gz"
-    dest: "{{ cri_release_directory }}"
-    mode: 0755
-
-- name: "Unpack Containerd and CRI-Containerd"
   unarchive:
-    src: "{{ cri_release_directory }}cri-containerd-{{ cri_containerd_release_version }}.tar.gz"
-    dest: "{{ cri_release_directory }}"
-    remote_src: yes
-
-- name: "Install the containerd and cri-containerd binaries" 
-  copy:
-    src: "{{ cri_release_directory }}usr/local/bin/{{ item }}"
-    dest: "{{ local_bin_dir }}{{ item }}"
-    mode: 0755
-    remote_src: yes
-  with_items:
-    - containerd
-    - containerd-stress
-    - containerd-shim
-    - cri-containerd
-    - ctr
-    - crictl
-
-- name: "Install runc"
-  copy:    
-    src: "{{ cri_release_directory }}usr/local/sbin/{{ item }}"
-    dest: "{{ local_sbin_dir }}{{ item }}"
-    mode: 0755
-    remote_src: yes
-  with_items:
-    - runc
-
-- name: "Copy systemd service units"
-  copy:
-    src: "{{ cri_release_directory }}etc/systemd/system/{{ item }}"
-    dest: "/etc/systemd/system/{{ item }}"
-    mode: 0644
+    src: "https://storage.googleapis.com/cri-containerd-staging/cri-containerd-{{ cri_containerd_release_version }}.tar.gz"
+    dest: "/"
     remote_src: yes
-  with_items:
-    - containerd.service
-    - cri-containerd.service
 
 - name: "Create a directory for cni binary"
   file: path={{ cni_bin_dir }} state=directory
diff --git a/contrib/ansible/vars/vars.yaml b/contrib/ansible/vars/vars.yaml
index ffc4053b41e6..da0a266cd252 100644
--- a/contrib/ansible/vars/vars.yaml
+++ b/contrib/ansible/vars/vars.yaml
@@ -1,6 +1,6 @@
 ---
 # TODO update official versions once they are available
-cri_containerd_release_version: 0.1.0-258-g529971a
+cri_containerd_release_version: 0.1.0-271-g86ee919
 cri_release_directory: /opt/cri-containerd/
 local_bin_dir: /usr/local/bin/
 local_sbin_dir: /usr/local/sbin/