summaryrefslogtreecommitdiffstats
path: root/roles/openshift_excluder/tasks
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-12-14 15:00:59 -0500
committerRussell Teague <rteague@redhat.com>2017-12-14 16:03:44 -0500
commitc113074f5b84881f416aca40e2bf4e20d4e6ce41 (patch)
tree307af8f0ddfc9bb5986dbcf8f17d2e2303f70386 /roles/openshift_excluder/tasks
parent29d3212bf1089661b9fd38db59d72160a39d39d4 (diff)
downloadopenshift-c113074f5b84881f416aca40e2bf4e20d4e6ce41.tar.gz
openshift-c113074f5b84881f416aca40e2bf4e20d4e6ce41.tar.bz2
openshift-c113074f5b84881f416aca40e2bf4e20d4e6ce41.tar.xz
openshift-c113074f5b84881f416aca40e2bf4e20d4e6ce41.zip
Deprecate using Ansible tests as filters
Diffstat (limited to 'roles/openshift_excluder/tasks')
-rw-r--r--roles/openshift_excluder/tasks/install.yml8
-rw-r--r--roles/openshift_excluder/tasks/verify_excluder.yml2
2 files changed, 5 insertions, 5 deletions
diff --git a/roles/openshift_excluder/tasks/install.yml b/roles/openshift_excluder/tasks/install.yml
index 3ac55894f..ad7c00d14 100644
--- a/roles/openshift_excluder/tasks/install.yml
+++ b/roles/openshift_excluder/tasks/install.yml
@@ -14,7 +14,7 @@
- r_openshift_excluder_enable_docker_excluder | bool
- ansible_pkg_mgr == "yum"
register: result
- until: result | success
+ until: result is succeeded
# For DNF we do not need the "*" and if we add it, it causes an error because
@@ -29,7 +29,7 @@
- r_openshift_excluder_enable_docker_excluder | bool
- ansible_pkg_mgr == "dnf"
register: result
- until: result | success
+ until: result is succeeded
- name: Install openshift excluder - yum
package:
@@ -39,7 +39,7 @@
- r_openshift_excluder_enable_openshift_excluder | bool
- ansible_pkg_mgr == "yum"
register: result
- until: result | success
+ until: result is succeeded
# For DNF we do not need the "*" and if we add it, it causes an error because
# it's not a valid pkg_spec
@@ -53,7 +53,7 @@
- r_openshift_excluder_enable_openshift_excluder | bool
- ansible_pkg_mgr == "dnf"
register: result
- until: result | success
+ until: result is succeeded
- set_fact:
r_openshift_excluder_install_ran: True
diff --git a/roles/openshift_excluder/tasks/verify_excluder.yml b/roles/openshift_excluder/tasks/verify_excluder.yml
index c35639c1b..4f5277fa2 100644
--- a/roles/openshift_excluder/tasks/verify_excluder.yml
+++ b/roles/openshift_excluder/tasks/verify_excluder.yml
@@ -29,4 +29,4 @@
msg: "Available {{ excluder }} version {{ excluder_version }} is higher than the upgrade target version"
when:
- excluder_version != ''
- - excluder_version.split('.')[0:2] | join('.') | version_compare(r_openshift_excluder_upgrade_target.split('.')[0:2] | join('.'), '>', strict=True)
+ - excluder_version.split('.')[0:2] | join('.') is version_compare(r_openshift_excluder_upgrade_target.split('.')[0:2] | join('.'), '>', strict=True)