From c5c222eddb0b8950995105c4c406f5a5d0bfbacd Mon Sep 17 00:00:00 2001
From: Russell Teague <rteague@redhat.com>
Date: Thu, 11 May 2017 11:46:34 -0400
Subject: Rework openshift_excluders role

---
 roles/openshift_excluder/tasks/verify_excluder.yml | 49 ++++++++++------------
 1 file changed, 23 insertions(+), 26 deletions(-)

(limited to 'roles/openshift_excluder/tasks/verify_excluder.yml')

diff --git a/roles/openshift_excluder/tasks/verify_excluder.yml b/roles/openshift_excluder/tasks/verify_excluder.yml
index aebdb8c58..c35639c1b 100644
--- a/roles/openshift_excluder/tasks/verify_excluder.yml
+++ b/roles/openshift_excluder/tasks/verify_excluder.yml
@@ -1,35 +1,32 @@
 ---
 # input variables:
-# - repoquery_cmd
 # - excluder
-# - openshift_upgrade_target
-- block:
-  - name: Get available excluder version
-    repoquery:
-      name: "{{ excluder }}"
-      ignore_excluders: true
-    register: excluder_out
+- name: Get available excluder version
+  repoquery:
+    name: "{{ excluder }}"
+    ignore_excluders: true
+  register: repoquery_out
 
-  - fail:
-      msg: "Package {{ excluder }} not found"
-    when: not excluder_out.results.package_found
+- name: Fail when excluder package is not found
+  fail:
+    msg: "Package {{ excluder }} not found"
+  when: not repoquery_out.results.package_found
 
-  - set_fact:
-      excluder_version: "{{ excluder_out.results.versions.available_versions.0 }}"
+- name: Set fact excluder_version
+  set_fact:
+    excluder_version: "{{ repoquery_out.results.versions.available_versions.0 }}"
 
-  - name: "{{ excluder }} version detected"
-    debug:
-      msg: "{{ excluder }}: {{ excluder_version }}"
+- name: "{{ excluder }} version detected"
+  debug:
+    msg: "{{ excluder }}: {{ excluder_version }}"
 
-  - name: Printing upgrade target version
-    debug:
-      msg: "{{ openshift_upgrade_target }}"
+- name: Printing upgrade target version
+  debug:
+    msg: "{{ r_openshift_excluder_upgrade_target }}"
 
-  - name: Check the available {{ excluder }} version is at most of the upgrade target version
-    fail:
-      msg: "Available {{ excluder }} version {{ excluder_version }} is higher than the upgrade target version"
-    when:
-    - "{{ excluder_version != '' }}"
-    - "{{ excluder_version.split('.')[0:2] | join('.') | version_compare(openshift_upgrade_target.split('.')[0:2] | join('.'), '>', strict=True) }}"
+- name: Check the available {{ excluder }} version is at most of the upgrade target version
+  fail:
+    msg: "Available {{ excluder }} version {{ excluder_version }} is higher than the upgrade target version"
   when:
-  - not openshift.common.is_atomic | bool
+  - excluder_version != ''
+  - excluder_version.split('.')[0:2] | join('.') | version_compare(r_openshift_excluder_upgrade_target.split('.')[0:2] | join('.'), '>', strict=True)
-- 
cgit v1.2.3