From 70b28288a3037e39c2c7088b515129fb849d61da Mon Sep 17 00:00:00 2001
From: Maxime Brunet <max@brnt.mx>
Date: Tue, 14 Aug 2018 10:08:43 -0400
Subject: [PATCH 1/2] Use delegate_to: localhost instead of local_action

Allow to use `ansible_become: true` (#2969)
And set it to `false` for `localhost` with an `host_var`
---
 .../kubernetes/preinstall/tasks/pre_upgrade.yml | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/roles/kubernetes/preinstall/tasks/pre_upgrade.yml b/roles/kubernetes/preinstall/tasks/pre_upgrade.yml
index 63cbc9be1..60e302262 100644
--- a/roles/kubernetes/preinstall/tasks/pre_upgrade.yml
+++ b/roles/kubernetes/preinstall/tasks/pre_upgrade.yml
@@ -1,28 +1,23 @@
 ---
 - name: "Pre-upgrade | check if old credential dir exists"
-  local_action:
-    module: stat
+  stat:
     path: "{{ inventory_dir }}/../credentials"
-  vars:
-    ansible_python_interpreter: "/usr/bin/env python"
+  delegate_to: localhost
   register: old_credential_dir
   become: no
 
 - name: "Pre-upgrade | check if new credential dir exists"
-  local_action:
-    module: stat
+  stat:
     path: "{{ inventory_dir }}/credentials"
-  vars:
-    ansible_python_interpreter: "/usr/bin/env python"
+  delegate_to: localhost
   register: new_credential_dir
   become: no
   when: old_credential_dir.stat.exists
 
 - name: "Pre-upgrade | move data from old credential dir to new"
-  local_action: command mv {{ inventory_dir }}/../credentials {{ inventory_dir }}/credentials
+  command: mv {{ inventory_dir }}/../credentials {{ inventory_dir }}/credentials
   args:
     creates: "{{ inventory_dir }}/credentials"
-  vars:
-    ansible_python_interpreter: "/usr/bin/env python"
+  delegate_to: localhost
   become: no
   when: old_credential_dir.stat.exists and not new_credential_dir.stat.exists

From 33135f2ada7c5d842852405a8970bd49e6c00c91 Mon Sep 17 00:00:00 2001
From: Maxime Brunet <max@brnt.mx>
Date: Sat, 25 Aug 2018 14:33:31 -0400
Subject: [PATCH 2/2] k8s/preinstall: Turn AND condition into a list

---
 roles/kubernetes/preinstall/tasks/pre_upgrade.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/roles/kubernetes/preinstall/tasks/pre_upgrade.yml b/roles/kubernetes/preinstall/tasks/pre_upgrade.yml
index 60e302262..9bace42dc 100644
--- a/roles/kubernetes/preinstall/tasks/pre_upgrade.yml
+++ b/roles/kubernetes/preinstall/tasks/pre_upgrade.yml
@@ -20,4 +20,6 @@
     creates: "{{ inventory_dir }}/credentials"
   delegate_to: localhost
   become: no
-  when: old_credential_dir.stat.exists and not new_credential_dir.stat.exists
+  when:
+    - old_credential_dir.stat.exists
+    - not new_credential_dir.stat.exists