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/openshift_resource/tasks/command.yml | 4 ++--
roles/openshift_resource/tasks/lookup.yml | 2 +-
roles/openshift_resource/tasks/patch.yml | 2 +-
roles/openshift_resource/tasks/resource.yml | 2 +-
roles/openshift_resource/tasks/template.yml | 8 ++++----
5 files changed, 9 insertions(+), 9 deletions(-)
(limited to 'roles/openshift_resource/tasks')
diff --git a/roles/openshift_resource/tasks/command.yml b/roles/openshift_resource/tasks/command.yml
index c8e8d04..2c51665 100644
--- a/roles/openshift_resource/tasks/command.yml
+++ b/roles/openshift_resource/tasks/command.yml
@@ -4,7 +4,7 @@
command: "oc get -n {{project}} {{resource}}"
register: result
failed_when: false
- changed_when: (result | failed)
+ changed_when: result is failed
- name: Detroy existing resources
command: "oc delete -n {{project}} {{resource}}"
@@ -13,5 +13,5 @@
- name: Executing command
command: "oc -n {{ project }} {{ command }}"
- when: (recreate|default(false)) or (result | changed)
+ when: (recreate|default(false)) or (result is changed)
run_once: true
diff --git a/roles/openshift_resource/tasks/lookup.yml b/roles/openshift_resource/tasks/lookup.yml
index 07beb81..c5eb2a3 100644
--- a/roles/openshift_resource/tasks/lookup.yml
+++ b/roles/openshift_resource/tasks/lookup.yml
@@ -3,4 +3,4 @@
command: "oc get -n {{project}} {{rkind}}/{{rname}}"
register: result
failed_when: false
- changed_when: (result | failed)
+ changed_when: result is failed
diff --git a/roles/openshift_resource/tasks/patch.yml b/roles/openshift_resource/tasks/patch.yml
index 501f692..76d010e 100644
--- a/roles/openshift_resource/tasks/patch.yml
+++ b/roles/openshift_resource/tasks/patch.yml
@@ -36,6 +36,6 @@
- name: "Patch {{resource}} in {{project}}"
command: "oc patch -n '{{project}}' '{{resource}}' --patch '{{xpatch}}'"
register: result
- changed_when: (result | succeeded)
+ changed_when: result is succeeded
when: dummy_result.stdout != patch_result.stdout
\ No newline at end of file
diff --git a/roles/openshift_resource/tasks/resource.yml b/roles/openshift_resource/tasks/resource.yml
index 416f485..03420a9 100644
--- a/roles/openshift_resource/tasks/resource.yml
+++ b/roles/openshift_resource/tasks/resource.yml
@@ -13,7 +13,7 @@
command: "oc delete -n {{project}} {{rkind}}/{{rname}}"
register: rm_result
failed_when: false
- changed_when: (rm_result | succeeded)
+ changed_when: rm_result is succeeded
when: (recreate|default(false))
- name: "Populate resources defined in {{ template }} to {{project}} ({{ replace | default(false) | ternary('replace', 'create') }})"
diff --git a/roles/openshift_resource/tasks/template.yml b/roles/openshift_resource/tasks/template.yml
index f593544..b3838b5 100644
--- a/roles/openshift_resource/tasks/template.yml
+++ b/roles/openshift_resource/tasks/template.yml
@@ -12,14 +12,14 @@
command: "oc get -n {{project}} {{item.kind}}/{{item.name}}"
register: results
failed_when: false
- changed_when: (results | failed)
+ changed_when: results is failed
with_items: "{{ resources | default([]) }}"
- name: "{{ template }}: Detroy existing resources in {{project}}"
command: "oc delete -n {{project}} {{resources[item|int].kind}}/{{resources[item|int].name}}"
failed_when: false
with_sequence: start=0 count="{{resources | default([]) | length}}"
- when: ((recreate|default(false)) or (results | changed)) and (results.results[item|int].rc == 0)
+ when: ((recreate|default(false)) or (results is changed)) and (results.results[item|int].rc == 0)
# Replace often complains on various immutable variables it can't change. We ignore.
- name: "{{ template }}: Populate resources to {{project}} ({{ replace | default(false) | ternary('replace', 'create') }})"
@@ -27,14 +27,14 @@
register: status
failed_when: (status.rc != 0) and not (replace | default(false))
when:
- - (recreate | default(false)) or (replace | default(false)) or (results | changed)
+ - (recreate | default(false)) or (replace | default(false)) or (results is changed)
- resources | length > 0
# Replace will not create missing resources. We need to create here.
- name: "{{ template }}: Populate missing resources to {{project}} ({{ replace | default(false) | ternary('replace', 'create') }})"
shell: "oc process -n {{project}} -f '{{ template_path }}/{{template}}' {{ template_args | default('') }} | oc create -n {{project}} -f - {{ create_args | default('') }}"
when:
- - (replace | default(false)) and (results | changed)
+ - (replace | default(false)) and (results is changed)
- resources | length > 0
--
cgit v1.2.3