summaryrefslogtreecommitdiffstats
path: root/roles/docker/tasks/main.yml
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-07-15 09:23:54 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-07-15 09:23:54 -0300
commit5848ccd733fadeb984acdb692bf24a336fcb4ef8 (patch)
tree053b0045a196e2dcdf799fa8cca6940aa455cd86 /roles/docker/tasks/main.yml
parent11c44e8d572258ac0a729f789a5cc15f9bbcdada (diff)
downloadopenshift-5848ccd733fadeb984acdb692bf24a336fcb4ef8.tar.gz
openshift-5848ccd733fadeb984acdb692bf24a336fcb4ef8.tar.bz2
openshift-5848ccd733fadeb984acdb692bf24a336fcb4ef8.tar.xz
openshift-5848ccd733fadeb984acdb692bf24a336fcb4ef8.zip
Clarify message when old docker pre-installed but 1.10+ requested.
Diffstat (limited to 'roles/docker/tasks/main.yml')
-rw-r--r--roles/docker/tasks/main.yml2
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.