From fabcad6e62cab4e4b53e3f7c7f65db323676ce99 Mon Sep 17 00:00:00 2001 From: Michal Ptacek Date: Mon, 4 Feb 2019 06:38:08 +0000 Subject: Fixing missing clause for enabling helm deploy As a part of change merged recently in 271cf3ffc2977f9e4 support for OOM plugins was introduced however it was never used. This commit is fixing this and introducing helm deploy option if plugin exists. Change-Id: Ifb77ce2098ea28f822e5e15ddf2736f0c83b946c Signed-off-by: Michal Ptacek Signed-off-by: Milan Verespej Issue-ID: OOM-1589 Signed-off-by: Milan Verespej --- ansible/roles/application-install/tasks/install.yml | 14 ++++++++++++-- ansible/roles/application-install/tasks/pre-install.yml | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) (limited to 'ansible/roles/application-install/tasks') diff --git a/ansible/roles/application-install/tasks/install.yml b/ansible/roles/application-install/tasks/install.yml index d385b448..eaa40ce2 100644 --- a/ansible/roles/application-install/tasks/install.yml +++ b/ansible/roles/application-install/tasks/install.yml @@ -38,5 +38,15 @@ environment: PATH: "{{ helm_bin_dir }}:{{ ansible_env.PATH }}" -- name: Helm Install application {{ app_name }} - command: "{{ helm_bin_dir }}/helm install {{ helm_repository_name }}/{{ app_helm_chart_name }} --name {{ app_helm_release_name }} --namespace {{ app_kubernetes_namespace }}" +- name: Check for deploy plugin presence + stat: + path: '~/.helm/plugins/deploy/deploy.sh' + register: deploy_plugin_presence + +- name: "Helm Install application {{ app_name }}" + command: > + {{ helm_bin_dir }}/helm + {{ 'deploy' if deploy_plugin_presence.stat.exists else 'install --name' }} + {{ app_helm_release_name }} + {{ helm_repository_name }}/{{ app_helm_chart_name }} + --namespace {{ app_kubernetes_namespace }} diff --git a/ansible/roles/application-install/tasks/pre-install.yml b/ansible/roles/application-install/tasks/pre-install.yml index 88a95ea6..3d63cb55 100644 --- a/ansible/roles/application-install/tasks/pre-install.yml +++ b/ansible/roles/application-install/tasks/pre-install.yml @@ -38,7 +38,7 @@ become: true when: app_helm_plugins_directory is defined and app_helm_plugins_directory is not none -- name: "Execute custome role {{ application_pre_install_role }} if defined." +- name: "Execute custom role {{ application_pre_install_role }} if defined." include_tasks: custom_role.yml vars: application_custom_role: "{{ application_pre_install_role }}" -- cgit 1.2.3-korg