From eb40ac163f05b2909e9f7178637d89bb341f5daa Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <matthew.mosesohn@gmail.com>
Date: Tue, 10 Sep 2019 22:30:55 +0300
Subject: [PATCH] Move cri_socket var to kubespray-defaults (#5149)

---
 roles/download/tasks/main.yml               | 15 ---------------
 roles/kubespray-defaults/defaults/main.yaml | 10 ++++++++++
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/roles/download/tasks/main.yml b/roles/download/tasks/main.yml
index d42b50f3d..c780ad89b 100644
--- a/roles/download/tasks/main.yml
+++ b/roles/download/tasks/main.yml
@@ -7,21 +7,6 @@
     - download
     - upload
 
-- name: Use cri-o for cri connection
-  set_fact:
-    cri_socket: /var/run/crio/crio.sock
-  when: container_manager == 'crio'
-
-- name: Use containerd for cri connection
-  set_fact:
-    cri_socket: /var/run/containerd/containerd.sock
-  when: container_manager == 'containerd'
-
-- name: Use docker for cri connection
-  set_fact:
-    cri_socket: /var/run/dockershim.sock
-  when: container_manager == 'docker'
-
 - include_tasks: ../../container-engine/containerd/tasks/crictl.yml
   when:
     - not skip_downloads|default(false)
diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml
index b6bd45dd2..4945fdd2e 100644
--- a/roles/kubespray-defaults/defaults/main.yaml
+++ b/roles/kubespray-defaults/defaults/main.yaml
@@ -198,6 +198,16 @@ kube_profiling: false
 # Container for runtime
 container_manager: docker
 
+# CRI socket path
+cri_socket: >-
+  {%- if container_manager == 'crio' -%}
+  /var/run/crio/crio.sock
+  {%- elif container_manager == 'containerd' -%}
+  /var/run/containerd/containerd.sock
+  {%- else -%}
+  /var/run/dockershim.sock
+  {%- endif -%}
+
 ## Uncomment this if you want to force overlay/overlay2 as docker storage driver
 ## Please note that overlay2 is only supported on newer kernels
 # docker_storage_options: -s overlay2