From 1b0556f73f6cac0ee799f5746248d3c51fd8ce9f Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup@redhat.com>
Date: Fri, 28 Apr 2017 15:41:00 +0200
Subject: move excluder upgrade validation tasks under openshift_excluder role

---
 .../upgrades/disable_excluder.yml                  | 13 +++-------
 .../upgrades/pre/validate_excluder.yml             | 29 ----------------------
 2 files changed, 4 insertions(+), 38 deletions(-)
 delete mode 100644 playbooks/common/openshift-cluster/upgrades/pre/validate_excluder.yml

(limited to 'playbooks/common')

diff --git a/playbooks/common/openshift-cluster/upgrades/disable_excluder.yml b/playbooks/common/openshift-cluster/upgrades/disable_excluder.yml
index a30952929..02042c1ef 100644
--- a/playbooks/common/openshift-cluster/upgrades/disable_excluder.yml
+++ b/playbooks/common/openshift-cluster/upgrades/disable_excluder.yml
@@ -3,15 +3,10 @@
   hosts: oo_masters_to_config:oo_nodes_to_config
   gather_facts: no
   tasks:
-  - include: pre/validate_excluder.yml
-    vars:
-      excluder: "{{ openshift.common.service_type }}-docker-excluder"
-    when: enable_docker_excluder | default(enable_excluders) | default(True) | bool
-  - include: pre/validate_excluder.yml
-    vars:
-      excluder: "{{ openshift.common.service_type }}-excluder"
-    when: enable_openshift_excluder | default(enable_excluders) | default(True) | bool
-
+  # verify the excluders can be upgraded
+  - include_role:
+      name: openshift_excluder
+      tasks_from: verify_upgrade
 
   # disable excluders based on their status
   - include_role:
diff --git a/playbooks/common/openshift-cluster/upgrades/pre/validate_excluder.yml b/playbooks/common/openshift-cluster/upgrades/pre/validate_excluder.yml
deleted file mode 100644
index 6de1ed061..000000000
--- a/playbooks/common/openshift-cluster/upgrades/pre/validate_excluder.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-# input variables:
-# - repoquery_cmd
-# - excluder
-# - openshift_upgrade_target
-- block:
-  - name: Get available excluder version
-    command: >
-      {{ repoquery_cmd }} --qf '%{version}' "{{ excluder }}"
-    register: excluder_version
-    failed_when: false
-    changed_when: false
-
-  - name: Docker excluder version detected
-    debug:
-      msg: "{{ excluder }}: {{ excluder_version.stdout }}"
-
-  - name: Printing upgrade target version
-    debug:
-      msg: "{{ openshift_upgrade_target }}"
-
-  - name: Check the available {{ excluder }} version is at most of the upgrade target version
-    fail:
-      msg: "Available {{ excluder }} version {{ excluder_version.stdout }} is higher than the upgrade target version"
-    when:
-    - "{{ excluder_version.stdout != '' }}"
-    - "{{ excluder_version.stdout.split('.')[0:2] | join('.') | version_compare(openshift_upgrade_target.split('.')[0:2] | join('.'), '>', strict=True) }}"
-  when:
-  - not openshift.common.is_atomic | bool
-- 
cgit v1.2.3