From bdcf77c2a664de34014a21913a3d3a0474f9bbba Mon Sep 17 00:00:00 2001
From: "Suren A. Chilingaryan" <csa@suren.me>
Date: Fri, 6 Dec 2019 10:14:00 +0100
Subject: Compatibility fixes with ansible 2.8

---
 roles/ands_kaas/tasks/do_apps.yml | 5 +++--
 roles/ands_kaas/tasks/project.yml | 8 ++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'roles/ands_kaas/tasks')

diff --git a/roles/ands_kaas/tasks/do_apps.yml b/roles/ands_kaas/tasks/do_apps.yml
index 5883ff8..9c57128 100644
--- a/roles/ands_kaas/tasks/do_apps.yml
+++ b/roles/ands_kaas/tasks/do_apps.yml
@@ -6,8 +6,8 @@
     loop_var: appitem
   when: 
     - appitem.value.provision | default(true)
-    - (ands_configure_app == ands_none) or (appname == ands_configure_app)
-    - appname | match(kaas_app_regexp | default(.*))
+    - (configure_app == ands_none) or (appname == configure_app)
+    - appname | match(kaas_app_regexp | default('.*'))
   vars:
     app: "{{ kaas_project_config[appitem.key] }}"
     appname: "{{ app.name | default(appitem.key) | regex_replace('_','-') }}"
@@ -19,3 +19,4 @@
     pods: "{{ app.pods | default({}) }}"
     builders: "{{ app.builders | default({}) }}"
     parameters: "{{ app.parameters | default({}) }}"
+    configure_app: "{{ ands_configure_app | default(ands_none) }}"
\ No newline at end of file
diff --git a/roles/ands_kaas/tasks/project.yml b/roles/ands_kaas/tasks/project.yml
index 149a102..5a83dff 100644
--- a/roles/ands_kaas/tasks/project.yml
+++ b/roles/ands_kaas/tasks/project.yml
@@ -22,14 +22,18 @@
   
 
 - name: Get information about block volumes
-  delegate_to: "{{ groups.masters[0] }}"
+  args:
+    apply:
+      delegate_to: "{{ groups.masters[0] }}"
   shell: gluster-block info {{ item.value.volume }}/{{ item.key }} | grep -oP '^GBID:\s*\K.*'
   register: iqn_info
   with_dict: "{{ kaas_block_volumes }}"
   when: item.value.project == kaas_project
 
 - name: Get more information about block volumes
-  delegate_to: "{{ groups.masters[0] }}"
+  args:
+    apply:
+      delegate_to: "{{ groups.masters[0] }}"
   shell: gluster-block info {{ item.value.volume }}/{{ item.key }} | grep -oP '^EXPORTED NODE.*:\s*\K.*' | tr ' ' '\n'
   register: portal_info
   with_dict: "{{ kaas_block_volumes }}"
-- 
cgit v1.2.3