From 8c9ed6719bdbc0ce7574fa9261c60e4978c203e6 Mon Sep 17 00:00:00 2001
From: Devan Goodwin <dgoodwin@redhat.com>
Date: Mon, 20 Jun 2016 14:45:42 -0300
Subject: Fix docker restarts during openshift_version role.

The variable here must be explicitly passed to the docker role, if it's
passed sometimes and not others, the docker config changes triggers a
docker restart effectively killing everything on the node in an unsafe
manner.

Instead lets make sure the value is set.
---
 roles/docker/defaults/main.yml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'roles/docker/defaults')

diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml
index 1b26af0dd..ed97d539c 100644
--- a/roles/docker/defaults/main.yml
+++ b/roles/docker/defaults/main.yml
@@ -1,2 +1 @@
 ---
-docker_version: ''
\ No newline at end of file
-- 
cgit v1.2.3


From 08f1caed84d46d0263f0c1aaaf2da891946b1a96 Mon Sep 17 00:00:00 2001
From: Devan Goodwin <dgoodwin@redhat.com>
Date: Mon, 27 Jun 2016 11:15:40 -0300
Subject: Only nuke images when crossing the Docker 1.10 boundary in upgrade.

---
 roles/docker/defaults/main.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'roles/docker/defaults')

diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml
index ed97d539c..da11ed0af 100644
--- a/roles/docker/defaults/main.yml
+++ b/roles/docker/defaults/main.yml
@@ -1 +1,2 @@
 ---
+docker_protect_installed_version: False
-- 
cgit v1.2.3