diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-09-15 10:29:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-15 10:29:47 -0400 |
| commit | b85045bb0df6df6f9468f4994047efb91ce47d2f (patch) | |
| tree | d0bdd1a59289a1f68b87b046ec508f75555e30f5 | |
| parent | 2987e7490ed2fa45772e18bc64b44fc3e22358ca (diff) | |
| parent | 9d24c99c0d00ce1bedabde88b7d2468698c54ac5 (diff) | |
| download | openshift-b85045bb0df6df6f9468f4994047efb91ce47d2f.tar.gz openshift-b85045bb0df6df6f9468f4994047efb91ce47d2f.tar.bz2 openshift-b85045bb0df6df6f9468f4994047efb91ce47d2f.tar.xz openshift-b85045bb0df6df6f9468f4994047efb91ce47d2f.zip | |
Merge pull request #2295 from dgoodwin/override-docker-upgrade
Allow overriding the Docker 1.10 requirement for upgrade.
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/docker/upgrade_check.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/docker/upgrade_check.yml b/playbooks/common/openshift-cluster/upgrades/docker/upgrade_check.yml index 06b3e244f..8002af4fc 100644 --- a/playbooks/common/openshift-cluster/upgrades/docker/upgrade_check.yml +++ b/playbooks/common/openshift-cluster/upgrades/docker/upgrade_check.yml @@ -28,7 +28,7 @@ - fail: msg: This playbook requires access to Docker 1.10 or later # Disable the 1.10 requirement if the user set a specific Docker version - when: avail_docker_version.stdout | version_compare('1.10','<') and docker_version is not defined + when: docker_version is not defined and (docker_upgrade is not defined or docker_upgrade | bool == True) and (avail_docker_version.stdout == "" or avail_docker_version.stdout | version_compare('1.10','<')) # Default l_docker_upgrade to False, we'll set to True if an upgrade is required: - set_fact: |