From 1cbdd7ed5c15e764adda347d20c7f0cf1c6c3da5 Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <matthew.mosesohn@gmail.com>
Date: Sun, 21 Jul 2019 10:08:53 +0300
Subject: [PATCH] Fixup etcdctl download for etcd kubeadm mode (#4991)

Change-Id: I8d8e59a97823390f40e8810905ca52430329f040
---
 roles/download/defaults/main.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 2f62f3d41..7c11668bc 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -314,13 +314,15 @@ downloads:
 
   etcd:
     container: "{{ etcd_deployment_type != 'host' }}"
-    file: "{{ etcd_deployment_type == 'host' }}"
+    file: "{{ etcd_deployment_type == 'host' or etcd_kubeadm_enabled }}"
     enabled: true
     version: "{{ etcd_version }}"
     dest: "{{local_release_dir}}/etcd-{{ etcd_version }}-linux-amd64.tar.gz"
     repo: "{{ etcd_image_repo }}"
     tag: "{{ etcd_image_tag }}"
-    sha256: "{{ etcd_binary_checksum if etcd_deployment_type == 'host' else etcd_digest_checksum|d(None) }}"
+    sha256: >-
+     {{ etcd_binary_checksum if (etcd_deployment_type == 'host' or etcd_kubeadm_enabled)
+     else etcd_digest_checksum|d(None) }}
     url: "{{ etcd_download_url }}"
     unarchive: true
     owner: "root"