summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-06-27 11:15:40 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-06-27 11:15:40 -0300
commit08f1caed84d46d0263f0c1aaaf2da891946b1a96 (patch)
tree836ef5dc147dc4399bead23fa82d4855f87de06f /roles
parent9a5bd6ab7b46228b62f8d8d29dd1f0574c3ec3fa (diff)
downloadopenshift-08f1caed84d46d0263f0c1aaaf2da891946b1a96.tar.gz
openshift-08f1caed84d46d0263f0c1aaaf2da891946b1a96.tar.bz2
openshift-08f1caed84d46d0263f0c1aaaf2da891946b1a96.tar.xz
openshift-08f1caed84d46d0263f0c1aaaf2da891946b1a96.zip
Only nuke images when crossing the Docker 1.10 boundary in upgrade.
Diffstat (limited to 'roles')
-rw-r--r--roles/docker/defaults/main.yml1
-rw-r--r--roles/docker/tasks/main.yml2
2 files changed, 2 insertions, 1 deletions
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
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 34be0a666..a52a28375 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -37,7 +37,7 @@
# Make sure Docker is installed, but does not update a running version.
# Docker upgrades are handled by a separate playbook.
- name: Install Docker
- action: "{{ ansible_pkg_mgr }} name=docker{{ '-' + docker_version if docker_version is defined else '' }} state=present"
+ action: "{{ ansible_pkg_mgr }} name=docker{{ '-' + docker_version if docker_version is defined and not docker_protect_installed_version | bool else '' }} state=present"
when: not openshift.common.is_atomic | bool
- name: Start the Docker service