X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tasks%2Faddon.yml;h=328664d087461e8baf4adaebde01971798315872;hb=d5b5cb172cd488883e2eac0395dbe4d34ddd7a44;hp=cba597267d48df18e7970af87376421d6582e3f0;hpb=ca163d9cd72f520a6c0a28ae613bdc757cfae1e5;p=github%2Ffretlink%2Fansible-clever.git

diff --git a/tasks/addon.yml b/tasks/addon.yml
index cba5972..328664d 100644
--- a/tasks/addon.yml
+++ b/tasks/addon.yml
@@ -1,13 +1,30 @@
-- name: Gather addon information for {{ addon.name }}
+- name: Gather addon information for {{ addon.name }} (clever --version < 1.5.0)
   shell: >
+    set -o pipefail &&
     clever env | grep {{ addon.env_prefix }}
     | sed -e 's/{{ addon.env_prefix }}_//' -e 's/=/: \"/' -e 's/$/\"/'
     > {{ clever_app_confdir }}/{{ addon.name }}_env.yml
   args:
     chdir: "{{ clever_app_root }}"
+    executable: "bash"
   environment:
     CONFIGURATION_FILE: "{{ clever_login_file }}"
   changed_when: False
+  when: clever_returned_version.stdout is version('1.5.0', '<')
+
+- name: Gather addon information for {{ addon.name }} (clever --version >= 1.5.0)
+  shell: >
+    set -o pipefail &&
+    clever env | grep {{ addon.env_prefix }}
+    | sed -e 's/{{ addon.env_prefix }}_//' -e 's/=/: /'
+    > {{ clever_app_confdir }}/{{ addon.name }}_env.yml
+  args:
+    chdir: "{{ clever_app_root }}"
+    executable: "bash"
+  environment:
+    CONFIGURATION_FILE: "{{ clever_login_file }}"
+  changed_when: False
+  when: clever_returned_version.stdout is version('1.5.0', '>=')
 
 - name: Include addon var for {{ addon.name }}
   include_vars: