Fix helm installation conflict

Kubespray installs helm client on kubernetes master. The same client
has to be installed on host running installation playbooks. In single
node scenario, local host already has helm client installed by
kubespray, thus leading to conflict due to way of provisioning.
This helm installation has been moved to global configure playbook, as
well as corrected, not to fail on single host deployments.

Issue-ID: MULTICLOUD-690

Signed-off-by: Konrad Bańka <k.banka@samsung.com>
Change-Id: I1ef779ed0f2fde82758ce9e229c3f5bb015b2aeb

diff --git a/kud/deployment_infra/playbooks/configure-istio.yml b/kud/deployment_infra/playbooks/configure-istio.yml
index 3a1ca8e..f975e30 100644 (file)
--- a/kud/deployment_infra/playbooks/configure-istio.yml
+++ b/kud/deployment_infra/playbooks/configure-istio.yml
@@ -9,14 +9,10 @@
 ##############################################################################
 
 - hosts: localhost
-  pre_tasks:
+  tasks:
     - name: Load kud variables
       include_vars:
         file: kud-vars.yml
-  roles:
-    - role: andrewrothstein.kubernetes-helm
-      kubernetes_helm_ver: "v{{ helm_client_version }}"
-  tasks:
     - name: create istio folder
       file:
         state: directory

diff --git a/kud/deployment_infra/playbooks/configure-kud.yml b/kud/deployment_infra/playbooks/configure-kud.yml
index 9dcf6f3..0e32e69 100644 (file)
--- a/kud/deployment_infra/playbooks/configure-kud.yml
+++ b/kud/deployment_infra/playbooks/configure-kud.yml
@@ -7,6 +7,23 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
+- hosts: localhost
+  pre_tasks:
+    - name: Load kud variables
+      include_vars:
+        file: kud-vars.yml
+    - name: Check if helm client is already installed #It is in single node deployment
+      command: helm version -c
+      register: helm_client
+      failed_when: False
+      changed_when: False
+      check_mode: False
+  roles:
+    - name: andrewrothstein.kubernetes-helm
+      when: helm_client.rc != 0
+      vars:
+          kubernetes_helm_ver: "v{{ helm_client_version }}"
+
 - hosts: kube-node
   become: yes
   tasks: