Ingress Nginx Integration

[infra/stack/kubernetes.git] / playbooks / roles / postinstall / tasks / configure-jumphost.yml

diff --git a/playbooks/roles/postinstall/tasks/configure-jumphost.yml b/playbooks/roles/postinstall/tasks/configure-jumphost.yml
index 3e0cfb55cf8917fb266f56d1f1e0dd6a40565cb2..4ba1e9073f5b44d6bfa9fb8625d446a024d68900 100644 (file)
--- a/playbooks/roles/postinstall/tasks/configure-jumphost.yml
+++ b/playbooks/roles/postinstall/tasks/configure-jumphost.yml
@@ -22,7 +22,7 @@
 
 - name: Install openshift
   pip:
-    name: openshift
+    name: "openshift=={{ openshift_version }}"
 
 - name: Ensure /root/.kube folder exists and empty
   file:
@@ -39,7 +39,7 @@
     src: "{{ engine_cache }}/repos/kubespray/inventory/engine/artifacts/admin.conf"
     dest: "/root/.kube/config"
     owner: "root"
-    mode: 0644
+    mode: 0600
 
 - name: Download kubectl and place it to /usr/local/bin
   get_url:
@@ -55,17 +55,24 @@
     remote_src: true
     dest: /tmp
 
-- name: Place helm and tiller binaries to /usr/local/bin
+- name: Place helm binaries to /usr/local/bin
   copy:
-    src: "/tmp/linux-amd64/{{ item }}"
+    src: "/tmp/linux-amd64/helm"
     remote_src: true
-    dest: "/usr/local/bin/{{ item }}"
+    dest: "/usr/local/bin/helm"
     owner: root
     group: root
     mode: 0755
-  with_items:
-    - helm
-    - tiller
+
+- name: Place tiller binaries to /usr/local/bin
+  copy:
+    src: "/tmp/linux-amd64/tiller"
+    remote_src: true
+    dest: "/usr/local/bin/tiller"
+    owner: root
+    group: root
+    mode: 0755
+  when: helm_version is version('v3.0.0', '<')
 
 - name: Delete temporary files and folders
   file: