From d749719235a032b1728d4b2147b5b5adc51cc46a Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Tue, 24 Sep 2019 10:02:38 +0200
Subject: [PATCH] Fail if helmfile apply fails
---
ansible/roles/apps/tasks/cert-manager.yml | 3 +++
ansible/roles/apps/tasks/helmfiles.yml | 10 +++++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/ansible/roles/apps/tasks/cert-manager.yml b/ansible/roles/apps/tasks/cert-manager.yml
index 25bc6d990..7260efd02 100644
--- a/ansible/roles/apps/tasks/cert-manager.yml
+++ b/ansible/roles/apps/tasks/cert-manager.yml
@@ -45,6 +45,7 @@
- helmfile
- cert-manager
shell: |
+ set -e -x -o pipefail
/usr/local/bin/helmfile \
-b /snap/bin/helm \
-e oas \
@@ -53,3 +54,5 @@
--suppress-secrets \
| sed 's/\x1B\[[0-9;]*[JKmsu]//g' \
>> {{ log_directory }}/helmfile.log
+ args:
+ executable: /bin/bash
diff --git a/ansible/roles/apps/tasks/helmfiles.yml b/ansible/roles/apps/tasks/helmfiles.yml
index 109713520..657726af9 100644
--- a/ansible/roles/apps/tasks/helmfiles.yml
+++ b/ansible/roles/apps/tasks/helmfiles.yml
@@ -23,6 +23,14 @@
- NEXTCLOUD_MARIADB_PASSWORD: "{{ nextcloud_mariadb_password }}"
- NEXTCLOUD_MARIADB_ROOT_PASSWORD: "{{ nextcloud_mariadb_root_password }}"
- GRAFANA_ADMIN_PASSWORD: "{{ grafana_admin_password }}"
- shell: /usr/local/bin/helmfile -b /snap/bin/helm -e oas -f {{ data_directory }}/source/helmfiles/helmfile.d/{{ item }}.yaml apply --suppress-secrets | sed 's/\x1B\[[0-9;]*[JKmsu]//g' >> {{ log_directory }}/helmfile.log
+ shell: |
+ set -e -x -o pipefail
+ /usr/local/bin/helmfile -b /snap/bin/helm -e oas \
+ -f {{ data_directory }}/source/helmfiles/helmfile.d/{{ item }}.yaml \
+ apply --suppress-secrets \
+ | sed 's/\x1B\[[0-9;]*[JKmsu]//g' \
+ >> {{ log_directory }}/helmfile.log
+ args:
+ executable: /bin/bash
with_items: "{{ helmfiles }}"
when: item is not search("cert-manager")
--
GitLab