summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ansible/roles/application/molecule/custom_role/molecule.yml1
-rw-r--r--ansible/roles/application/molecule/default/molecule.yml1
-rw-r--r--ansible/roles/application/molecule/ubuntu/molecule.yml1
-rw-r--r--ansible/roles/application/tasks/install-helm2-plugins.yml25
-rw-r--r--ansible/roles/application/tasks/transfer-helm-charts.yml27
5 files changed, 30 insertions, 25 deletions
diff --git a/ansible/roles/application/molecule/custom_role/molecule.yml b/ansible/roles/application/molecule/custom_role/molecule.yml
index f9b29d92..eeea94b3 100644
--- a/ansible/roles/application/molecule/custom_role/molecule.yml
+++ b/ansible/roles/application/molecule/custom_role/molecule.yml
@@ -29,6 +29,7 @@ provisioner:
app_helm_chart_name: "{{ app_name }}"
application_pre_install_role: application/test-patch-role
application_post_install_role: application/test-patch-role
+ helm_version: v2
lint:
name: ansible-lint
playbooks:
diff --git a/ansible/roles/application/molecule/default/molecule.yml b/ansible/roles/application/molecule/default/molecule.yml
index 30c752e2..9d4102b8 100644
--- a/ansible/roles/application/molecule/default/molecule.yml
+++ b/ansible/roles/application/molecule/default/molecule.yml
@@ -27,6 +27,7 @@ provisioner:
- all
- onap
app_helm_chart_name: "{{ app_name }}"
+ helm_version: v2
lint:
name: ansible-lint
scenario:
diff --git a/ansible/roles/application/molecule/ubuntu/molecule.yml b/ansible/roles/application/molecule/ubuntu/molecule.yml
index 2fde35a2..8552ce59 100644
--- a/ansible/roles/application/molecule/ubuntu/molecule.yml
+++ b/ansible/roles/application/molecule/ubuntu/molecule.yml
@@ -28,6 +28,7 @@ provisioner:
- all
- onap
app_helm_chart_name: "{{ app_name }}"
+ helm_version: v2
lint:
name: ansible-lint
playbooks:
diff --git a/ansible/roles/application/tasks/install-helm2-plugins.yml b/ansible/roles/application/tasks/install-helm2-plugins.yml
new file mode 100644
index 00000000..f1f900e3
--- /dev/null
+++ b/ansible/roles/application/tasks/install-helm2-plugins.yml
@@ -0,0 +1,25 @@
+---
+- name: Install helm plugins if needed
+ block:
+ - name: Get helm dir
+ command: "{{ helm_bin_dir }}/helm home"
+ register: helm_home_dir
+ - name: Ensure that dir for helm plugins exists
+ file:
+ path: "{{ helm_home_dir.stdout }}/plugins"
+ state: directory
+ mode: 0755
+ - name: Register all plugins to be inserted by dir names
+ find:
+ paths: "{{ app_helm_plugins_directory }}"
+ file_type: "directory"
+ register: list_of_plugins
+ delegate_to: localhost
+ - name: Install all helm plugins from {{ app_helm_plugins_directory }} dir
+ copy:
+ src: "{{ item.path }}"
+ dest: "{{ helm_home_dir.stdout }}/plugins"
+ directory_mode: true
+ mode: 0755
+ loop: "{{ list_of_plugins.files }}"
+ when: app_helm_plugins_directory is defined and app_helm_plugins_directory is not none
diff --git a/ansible/roles/application/tasks/transfer-helm-charts.yml b/ansible/roles/application/tasks/transfer-helm-charts.yml
index 56c95cc4..ac910735 100644
--- a/ansible/roles/application/tasks/transfer-helm-charts.yml
+++ b/ansible/roles/application/tasks/transfer-helm-charts.yml
@@ -20,28 +20,5 @@
src: "{{ app_helm_charts_install_directory }}.tgz"
dest: "{{ app_helm_charts_infra_directory }}"
-
-- name: Install helm plugins if needed
- block:
- - name: Get helm dir
- command: "{{ helm_bin_dir }}/helm home"
- register: helm_home_dir
- - name: Ensure that dir for helm plugins exists
- file:
- path: "{{ helm_home_dir.stdout }}/plugins"
- state: directory
- mode: 0755
- - name: Register all plugins to be inserted by dir names
- find:
- paths: "{{ app_helm_plugins_directory }}"
- file_type: "directory"
- register: list_of_plugins
- delegate_to: localhost
- - name: Install all helm plugins from {{ app_helm_plugins_directory }} dir
- copy:
- src: "{{ item.path }}"
- dest: "{{ helm_home_dir.stdout }}/plugins"
- directory_mode: true
- mode: 0755
- loop: "{{ list_of_plugins.files }}"
- when: app_helm_plugins_directory is defined and app_helm_plugins_directory is not none
+- include_tasks: install-helm2-plugins.yml
+ when: helm_version | regex_search("^v2" )