From 74fb19c6c6089affeb71a4957032abe961e77bc4 Mon Sep 17 00:00:00 2001 From: Devan Goodwin Date: Thu, 10 Nov 2016 15:20:52 -0400 Subject: Begin requiring Docker 1.12. Building off the work done for Docker 1.10, we now require Docker 1.12 by default. The upgrade process was already set to ensure you are running the latest docker during upgrade, and the standalone docker upgrade playbook can also be used if desired. As before, you can override this Docker 1.12 requirement by setting a docker_version=1.10.3 (or similar), and you can skip the default to upgrade docker by setting docker_upgrade=False. --- inventory/byo/hosts.origin.example | 2 +- inventory/byo/hosts.ose.example | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'inventory/byo') diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index e769537f9..6985d04f0 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -84,7 +84,7 @@ openshift_release=v1.4 # Specify exact version of Docker to configure or upgrade to. # Downgrades are not supported and will error out. Be careful when upgrading docker from < 1.10 to > 1.10. -# docker_version="1.10.3" +# docker_version="1.12.1" # Skip upgrading Docker during an OpenShift upgrade, leaves the current Docker version alone. # docker_upgrade=False diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index be919c105..a73a482da 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -84,7 +84,7 @@ openshift_release=v3.4 # Specify exact version of Docker to configure or upgrade to. # Downgrades are not supported and will error out. Be careful when upgrading docker from < 1.10 to > 1.10. -# docker_version="1.10.3" +# docker_version="1.12.1" # Skip upgrading Docker during an OpenShift upgrade, leaves the current Docker version alone. # docker_upgrade=False -- cgit v1.2.1