diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-07-13 12:04:51 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-07-13 12:04:51 -0300 |
| commit | e1a032988800da90219af2944a1b34328ca6ae9e (patch) | |
| tree | 63cdd0c5100091ad9e634e416ed5f793c23dc891 /roles/docker | |
| parent | af2c6f8fee050173b846221371c34538f4dc8f79 (diff) | |
| download | openshift-e1a032988800da90219af2944a1b34328ca6ae9e.tar.gz openshift-e1a032988800da90219af2944a1b34328ca6ae9e.tar.bz2 openshift-e1a032988800da90219af2944a1b34328ca6ae9e.tar.xz openshift-e1a032988800da90219af2944a1b34328ca6ae9e.zip | |
Fix more docker role logic.
Diffstat (limited to 'roles/docker')
| -rw-r--r-- | roles/docker/tasks/main.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 8b6ce7eae..545317890 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -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 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, '>') # 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 | 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', '>=') # Make sure Docker is installed, but does not update a running version. # Docker upgrades are handled by a separate playbook. |