diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-08-15 10:01:33 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-08-15 10:21:12 -0300 |
| commit | 9d24c99c0d00ce1bedabde88b7d2468698c54ac5 (patch) | |
| tree | 4ec25f31f55bbdf137b86b5df04138e79e9505bd /playbooks | |
| parent | a37d605616c2c691bd31d3e04b24a4bd82c230b4 (diff) | |
| download | openshift-9d24c99c0d00ce1bedabde88b7d2468698c54ac5.tar.gz openshift-9d24c99c0d00ce1bedabde88b7d2468698c54ac5.tar.bz2 openshift-9d24c99c0d00ce1bedabde88b7d2468698c54ac5.tar.xz openshift-9d24c99c0d00ce1bedabde88b7d2468698c54ac5.zip | |
Allow overriding the Docker 1.10 requirement for upgrade.
Respect an explicit docker_version, and the use of docker_upgrade=False.
Diffstat (limited to 'playbooks')
| -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: |