From 5ea85531ec762930e6f34dc4240776e43e2b88e7 Mon Sep 17 00:00:00 2001
From: Rado Chmiel <r.chmiel@partner.samsung.com>
Date: Thu, 27 Jan 2022 12:54:54 +0100
Subject: noheat: improvements for infra setup and Helm push plugin

* set remote_src in helm installation
* add umount to clean up nfs mountpoint
* fix pip executable error for Ubuntu 20.04
* make separate volume usage for instances optional
* add ability to set public DNS servers to network creation
* change installation method to command since current stable release of kubernetes.core doesnt support versioning
* hardcode helm push plugin version to 0.9.0

Issue-ID: INT-1601
Signed-off-by: Maciej Wereski <m.wereski@partner.samsung.com>
Change-Id: I5d374db779f6fc1f165eb5efe9b69b8a05c9f388
---
 .../noheat/cluster-rke/ansible/roles/setup_helm/tasks/main.yml | 10 ++++------
 .../noheat/cluster-rke/ansible/roles/setup_nfs/tasks/main.yml  |  6 ++++++
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'deployment/noheat/cluster-rke')

diff --git a/deployment/noheat/cluster-rke/ansible/roles/setup_helm/tasks/main.yml b/deployment/noheat/cluster-rke/ansible/roles/setup_helm/tasks/main.yml
index c742fff7a..93787be5f 100644
--- a/deployment/noheat/cluster-rke/ansible/roles/setup_helm/tasks/main.yml
+++ b/deployment/noheat/cluster-rke/ansible/roles/setup_helm/tasks/main.yml
@@ -2,25 +2,23 @@
   get_url:
     url: "https://get.helm.sh/helm-v{{ helm_version }}-linux-amd64.tar.gz"
     dest: "/tmp"
-    mode: '0400'
 
 - name: Unarchive helm
   unarchive:
     src: "/tmp/helm-v{{ helm_version }}-linux-amd64.tar.gz"
     dest: "/tmp/"
-    mode: '0500'
+    remote_src: yes
 
 - name: Copy helm binary to $PATH
   become: yes
   copy:
     src: "/tmp/linux-amd64/helm"
     dest: "/usr/local/bin/"
+    remote_src: yes
     mode: '0555'
 
 - name: Install Helm Push plugin
-  kubernetes.core.helm_plugin:
-    plugin_path: "https://github.com/chartmuseum/helm-push.git"
-    state: present
+  command: helm plugin install --version 0.9.0 https://github.com/chartmuseum/helm-push.git
 
 - name: Install Helm OOM Deploy plugin
   kubernetes.core.helm_plugin:
@@ -36,7 +34,7 @@
   get_url:
     url: "https://raw.githubusercontent.com/helm/chartmuseum/v{{ chartmuseum_version }}/scripts/get-chartmuseum"
     dest: "/tmp/"
-    mode: '0500'
+    mode: '700'
 
 - name: Install chartmuseum
   become: yes
diff --git a/deployment/noheat/cluster-rke/ansible/roles/setup_nfs/tasks/main.yml b/deployment/noheat/cluster-rke/ansible/roles/setup_nfs/tasks/main.yml
index 398b56317..2d8d0b006 100644
--- a/deployment/noheat/cluster-rke/ansible/roles/setup_nfs/tasks/main.yml
+++ b/deployment/noheat/cluster-rke/ansible/roles/setup_nfs/tasks/main.yml
@@ -10,6 +10,12 @@
     state: present
   when: nfs_role is defined and nfs_role == "server"
 
+- name: Umount
+  ansible.posix.mount:
+    path: "{{ nfs_mountpoint }}"
+    state: unmounted
+  ignore_errors: yes
+
 - name: Remove leftovers
   file:
     path: "{{ nfs_mountpoint }}"
-- 
cgit 1.2.3-korg