diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-03-14 10:50:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-14 10:50:43 -0400 |
| commit | 8eff5bcea9097c239a3dc487289ad23e20e909b7 (patch) | |
| tree | b1570192edb48616c483000948096fde50bd9857 /playbooks | |
| parent | 1956134d9d16b9e2960352d3887b985849be1fb1 (diff) | |
| parent | 7dccfb7072483378f0462a447e1ae7e75e96ba3f (diff) | |
| download | openshift-8eff5bcea9097c239a3dc487289ad23e20e909b7.tar.gz openshift-8eff5bcea9097c239a3dc487289ad23e20e909b7.tar.bz2 openshift-8eff5bcea9097c239a3dc487289ad23e20e909b7.tar.xz openshift-8eff5bcea9097c239a3dc487289ad23e20e909b7.zip | |
Merge pull request #3620 from ingvagabund/enable-docker-during-installation-and-upgrade-by-default
Enable docker during installation and upgrade by default
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/common/openshift-cluster/initialize_openshift_version.yml | 7 |
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 |