diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-07-14 14:09:59 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-07-14 14:23:58 -0300 |
| commit | 3073846a8c9e02af06d4d56f0141766b2337424b (patch) | |
| tree | 39285ac0b4d4a0d2b3832b42e706602fd8930121 | |
| parent | 6bfa3dee1efb32f20dcdcb4c7964ffd02969d1f1 (diff) | |
| download | openshift-3073846a8c9e02af06d4d56f0141766b2337424b.tar.gz openshift-3073846a8c9e02af06d4d56f0141766b2337424b.tar.bz2 openshift-3073846a8c9e02af06d4d56f0141766b2337424b.tar.xz openshift-3073846a8c9e02af06d4d56f0141766b2337424b.zip | |
Fix upgrade with docker_version set.
| -rw-r--r-- | roles/docker/tasks/main.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 545317890..89a248d9e 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -11,7 +11,7 @@ - name: Error out if Docker pre-installed but too old fail: msg: "Docker {{ curr_docker_version.stdout }} is installed, but >= 1.9.1 is required." - when: not curr_docker_version | skipped and curr_docker_version.stdout != '' and curr_docker_version.stdout | version_compare('1.9.1', '<') and not docker_version is defined + when: not curr_docker_version | skipped and curr_docker_version.stdout != '' and curr_docker_version.stdout | version_compare('1.9.1', '<') and not docker_version is defined and not docker_protect_installed_version | bool - name: Error out if requested Docker is too old fail: @@ -31,14 +31,14 @@ - name: Fail if Docker version requested but downgrade is required fail: msg: "Docker {{ curr_docker_version.stdout }} is installed, but version {{ docker_version }} was requested." - when: not curr_docker_version | skipped and curr_docker_version.stdout != '' and docker_version is defined and curr_docker_version.stdout | version_compare(docker_version, '>') + when: not curr_docker_version | skipped and curr_docker_version.stdout != '' and docker_version is defined and curr_docker_version.stdout | version_compare(docker_version, '>') and not docker_protect_installed_version | bool # This involves an extremely slow migration process, users should instead run the # Docker 1.10 upgrade playbook to accomplish this. - name: Error out if attempting to upgrade Docker across the 1.10 boundary fail: msg: "Cannot upgrade Docker to >= 1.10, please use the Docker upgrade playbook for this." - when: not curr_docker_version | skipped and curr_docker_version.stdout != '' and curr_docker_version.stdout | version_compare('1.10', '<') and docker_version is defined and docker_version | version_compare('1.10', '>=') + when: not curr_docker_version | skipped and curr_docker_version.stdout != '' and curr_docker_version.stdout | version_compare('1.10', '<') and docker_version is defined and docker_version | version_compare('1.10', '>=') and not docker_protect_installed_version | bool # Make sure Docker is installed, but does not update a running version. # Docker upgrades are handled by a separate playbook. |