From b87109ff07443670a0c9ad0ab8ddfda548fa16c5 Mon Sep 17 00:00:00 2001
From: "Suren A. Chilingaryan" <csa@suren.me>
Date: Thu, 25 Feb 2021 02:59:50 +0100
Subject: Some changes of syntactic sugar for Ansible 3.9 compatibility

---
 roles/ands_network/tasks/common.yml                  |  2 +-
 roles/ands_network/tasks/firewall_service.yml        |  4 ++--
 roles/ands_network/tasks/nm_configure_connection.yml | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'roles/ands_network/tasks')

diff --git a/roles/ands_network/tasks/common.yml b/roles/ands_network/tasks/common.yml
index 03d9fb4..11caac5 100644
--- a/roles/ands_network/tasks/common.yml
+++ b/roles/ands_network/tasks/common.yml
@@ -30,7 +30,7 @@
 
 - name: Provision /etc/hosts with load-balance IP on non master servers
   lineinfile: dest="/etc/hosts" line="{{ ands_inner_lb_ip }} {{ openshift_master_cluster_hostname }}" regexp=".*{{ openshift_master_cluster_hostname }}$" state="present"
-  when: (result | skipped) and (ands_use_inner_lb | default(false))
+  when: (result is skipped) and (ands_use_inner_lb | default(false))
 
 - name: Provision inner load-balancer hostname in /etc/hosts
   lineinfile: dest="/etc/hosts" line="{{ ands_inner_lb_ip }} {{ ands_inner_lb_hostname }} {{ ands_inner_lb_fqdn }}" regexp=".*{{ ands_inner_lb_fqdn }}$" state="present"
diff --git a/roles/ands_network/tasks/firewall_service.yml b/roles/ands_network/tasks/firewall_service.yml
index d3c6e9b..80612e7 100644
--- a/roles/ands_network/tasks/firewall_service.yml
+++ b/roles/ands_network/tasks/firewall_service.yml
@@ -6,8 +6,8 @@
   command: "firewall-offline-cmd  --remove-service={{ service }}"
   when: 
     - service in servicelist
-    - result | changed
+    - result is changed
   
 - name: "Create firewalld service '{{ service }}'"
   command: "firewall-offline-cmd --new-service-from-file='{{ firewall_template_path }}/{{ service }}.xml' --name={{ service }}"
-  when: (service not in servicelist) or (result | changed)
+  when: (service not in servicelist) or (result is changed)
diff --git a/roles/ands_network/tasks/nm_configure_connection.yml b/roles/ands_network/tasks/nm_configure_connection.yml
index 9354fbf..b2f2e9f 100644
--- a/roles/ands_network/tasks/nm_configure_connection.yml
+++ b/roles/ands_network/tasks/nm_configure_connection.yml
@@ -32,21 +32,21 @@
   command: "nmcli connection add type bridge ifname {{ bridge | quote }} con-name {{ name }} ip4 {{ cidr }}"
   when: 
     - bridge is defined
-    - (conres.rc != 0) or (not (delres | skipped))
+    - (conres.rc != 0) or (not (delres is skipped))
     - (conres.rc != 0) or (not (alias | default(false)))
   
 - name: "connect bridge '{{ bridge }}' to interface '{{ iface }}'"
   command: "nmcli connection add type bridge-slave ifname {{ iface | quote }} master {{ bridge | quote }}"
   when: 
     - bridge is defined
-    - (conres.rc != 0) or (not (delres | skipped))
+    - (conres.rc != 0) or (not (delres is skipped))
     - (conres.rc != 0) or (not (alias | default(false)))
     
 - name: "configure network interface '{{ iface }}' to '{{ cidr }}'"
   command: "nmcli connection add type infiniband ifname {{ iface | quote }} con-name {{ name }} ip4 {{ cidr }}"
   when: 
     - bridge is not defined
-    - (conres.rc != 0) or (not (delres | skipped))
+    - (conres.rc != 0) or (not (delres is skipped))
     - (conres.rc != 0) or (not (alias | default(false)))
 
 - name: "add ip alias '{{ cidr }}' to connection '{{ conres.stdout }}' using interface '{{ iface }}'"
@@ -63,6 +63,6 @@
   vars:
     cname: "{{ (conres.stdout == '') | ternary(name, conres.stdout) }}"
   when: 
-    - not(alres | skipped)
-    - alres | succeeded
+    - not(alres is skipped)
+    - alres is succeeded
     - not ip_present
-- 
cgit v1.2.3