From 0b305fe14e9024e76c07df843094fb9e6d8e0d2b Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Mon, 11 Mar 2019 21:13:09 +0100
Subject: [PATCH] Improve tiller installation

---
 ansible/roles/setup/tasks/main.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/setup/tasks/main.yml b/ansible/roles/setup/tasks/main.yml
index 0811c39f1..ec602853a 100644
--- a/ansible/roles/setup/tasks/main.yml
+++ b/ansible/roles/setup/tasks/main.yml
@@ -31,6 +31,7 @@
   package:
     name: python3-pip
 
+# Needed for ansible k8s resource
 - name: Install openshift python module via pip3
   pip:
     name: openshift
@@ -42,12 +43,13 @@
     definition: "{{ lookup('file', 'k8s-config/tiller-permissions.yml') }}"
 
 - name: Check if tiller is already instaled
-  shell: '/snap/bin/helm ls || /bin/true'
+  command: /snap/bin/helm ls
+  failed_when: false
   register: helm_ls
   changed_when: false
 
 - name: Initialize helm
-  command: /snap/bin/helm init --upgrade --service-account=tiller
+  command: /snap/bin/helm init --service-account=tiller
   when: helm_ls.stderr.find('Error') != -1
 
 - name: Wait for tiller to become available
-- 
GitLab