diff options
| author | Jan Chaloupka <jchaloup@redhat.com> | 2017-05-02 10:13:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-02 10:13:00 +0200 |
| commit | 5e6c8d2f4b4e228f694713902a04c26c0f355c71 (patch) | |
| tree | 3a4f15f27d56beb9bfc8e191f3c5fd0dbba40cf3 /playbooks/common/openshift-cluster/upgrades | |
| parent | 81cf5123366814d098b7ca169a6e4deb2759507d (diff) | |
| parent | 1b0556f73f6cac0ee799f5746248d3c51fd8ce9f (diff) | |
| download | openshift-5e6c8d2f4b4e228f694713902a04c26c0f355c71.tar.gz openshift-5e6c8d2f4b4e228f694713902a04c26c0f355c71.tar.bz2 openshift-5e6c8d2f4b4e228f694713902a04c26c0f355c71.tar.xz openshift-5e6c8d2f4b4e228f694713902a04c26c0f355c71.zip | |
Merge pull request #4034 from ingvagabund/move-excluder-verification-code-under-excluders-role
[RFE] move excluder upgrade validation tasks under openshift_excluder role
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/disable_excluder.yml | 13 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/pre/validate_excluder.yml | 29 |
2 files changed, 4 insertions, 38 deletions
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 |