diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-07-15 11:08:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-15 11:08:39 -0400 |
| commit | ac97e4fb515c349c92c3309329364525eb052441 (patch) | |
| tree | 053b0045a196e2dcdf799fa8cca6940aa455cd86 /roles/docker/tasks | |
| parent | 65ffae3e6edc8902c591dfef792a505a16029698 (diff) | |
| parent | 5848ccd733fadeb984acdb692bf24a336fcb4ef8 (diff) | |
| download | openshift-ac97e4fb515c349c92c3309329364525eb052441.tar.gz openshift-ac97e4fb515c349c92c3309329364525eb052441.tar.bz2 openshift-ac97e4fb515c349c92c3309329364525eb052441.tar.xz openshift-ac97e4fb515c349c92c3309329364525eb052441.zip | |
Merge pull request #2156 from dgoodwin/aoi-32-upgrade-path
Two small upgrade related fixes
Diffstat (limited to 'roles/docker/tasks')
| -rw-r--r-- | roles/docker/tasks/main.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 89a248d9e..87a4e7af0 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -37,7 +37,7 @@ # 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." + msg: "Cannot upgrade Docker to >= 1.10, please upgrade or remove Docker manually, or use the Docker upgrade playbook if OpenShift is already installed." 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. |