diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-10 16:59:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-10 16:59:46 -0700 |
| commit | bf4bb23ddfa2d4c9b6d56d09ef8a16e5e9b5b009 (patch) | |
| tree | a80963ebea9539d5086bf3125a31fb2f50153ace /playbooks/common | |
| parent | af04da3ae11cfe5cc80de214a4ec665f1d1676b1 (diff) | |
| parent | 7d555333bcb88aa99ea8a1d46ce3f1383519f84f (diff) | |
| download | openshift-bf4bb23ddfa2d4c9b6d56d09ef8a16e5e9b5b009.tar.gz openshift-bf4bb23ddfa2d4c9b6d56d09ef8a16e5e9b5b009.tar.bz2 openshift-bf4bb23ddfa2d4c9b6d56d09ef8a16e5e9b5b009.tar.xz openshift-bf4bb23ddfa2d4c9b6d56d09ef8a16e5e9b5b009.zip | |
Merge pull request #5129 from maxamillion/fedora-compat
Automatic merge from submit-queue.
Fedora compat fixes for package version checks and dnf bug workaround
Fix a couple things that don't work with Fedora:
- Don't attempt to version check components, they aren't going to match the hard coded RHEL package versions.
- Work around a [bug in dnf](https://bugzilla.redhat.com/show_bug.cgi?id=1199432)'s python API that throws an error when a package spec has a `*` character in the Release field
Once we're done with review, I'll squash commits.
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index b399ea995..dbe09dce2 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/playbooks/common/openshift-cluster/config.yml @@ -8,7 +8,10 @@ vars: - r_openshift_health_checker_playbook_context: install post_tasks: - - action: openshift_health_check + + - name: Verify Requirements - EL + when: ansible_distribution != "Fedora" + action: openshift_health_check args: checks: - disk_availability @@ -17,6 +20,12 @@ - package_version - docker_image_availability - docker_storage + - name: Verify Requirements - Fedora + when: ansible_distribution == "Fedora" + action: openshift_health_check + args: + checks: + - docker_image_availability - include: ../openshift-etcd/config.yml |