summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-03-17 08:13:54 -0400
committerGitHub <noreply@github.com>2017-03-17 08:13:54 -0400
commit71d230dd62d951d7afe5b8f8db6b3514545b5c69 (patch)
tree5e66e21bd5288d699dbcd20ea0f9af41d1511973 /playbooks/common/openshift-cluster
parentc73bb3aa5b2b28ddbdf48f9735b5afa1b8228cd6 (diff)
parent2e053649f188e88f4fcfcd4325e0f950a8cbe54e (diff)
downloadopenshift-71d230dd62d951d7afe5b8f8db6b3514545b5c69.tar.gz
openshift-71d230dd62d951d7afe5b8f8db6b3514545b5c69.tar.bz2
openshift-71d230dd62d951d7afe5b8f8db6b3514545b5c69.tar.xz
openshift-71d230dd62d951d7afe5b8f8db6b3514545b5c69.zip
Merge pull request #3694 from ingvagabund/enable-docker-during-installation-and-upgrade-by-default-revert-revert
enable docker excluder since the time it is installed
Diffstat (limited to 'playbooks/common/openshift-cluster')
-rw-r--r--playbooks/common/openshift-cluster/initialize_openshift_version.yml7
1 files changed, 7 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/initialize_openshift_version.yml b/playbooks/common/openshift-cluster/initialize_openshift_version.yml
index f8981c040..1f74e929f 100644
--- a/playbooks/common/openshift-cluster/initialize_openshift_version.yml
+++ b/playbooks/common/openshift-cluster/initialize_openshift_version.yml
@@ -23,6 +23,9 @@
vars:
# the excluders needs to be disabled no matter what status says
with_status_check: false
+ # Only openshift excluder needs to be temporarily disabled
+ # So ignore the docker one
+ enable_docker_excluder: false
tags:
- always
when: openshift_upgrade_target is not defined
@@ -44,6 +47,10 @@
# Re-enable excluders if they are meant to be enabled (and only during installation, upgrade disables the excluders before this play)
- include: reset_excluder.yml
+ vars:
+ # Only openshift excluder needs to be re-enabled
+ # So ignore the docker one
+ enable_docker_excluder: false
tags:
- always
when: openshift_upgrade_target is not defined