From 5848ccd733fadeb984acdb692bf24a336fcb4ef8 Mon Sep 17 00:00:00 2001
From: Devan Goodwin <dgoodwin@redhat.com>
Date: Fri, 15 Jul 2016 09:23:54 -0300
Subject: Clarify message when old docker pre-installed but 1.10+ requested.
---
roles/docker/tasks/main.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'roles')
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.
--
cgit v1.2.3