diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-03-14 17:43:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-14 17:43:09 -0400 |
| commit | 4c6d052e913c8a033c0198f4199b0f37f697bbe7 (patch) | |
| tree | 4cf4b5348222ca51ccd1cb5aaed2a891fc62c58f /playbooks | |
| parent | bc7816e7700cee6b6ab0bca4ebce20d4678ffa3a (diff) | |
| parent | d7bc1807702860db17b9acdafcb2b83b2b3f91ae (diff) | |
| download | openshift-4c6d052e913c8a033c0198f4199b0f37f697bbe7.tar.gz openshift-4c6d052e913c8a033c0198f4199b0f37f697bbe7.tar.bz2 openshift-4c6d052e913c8a033c0198f4199b0f37f697bbe7.tar.xz openshift-4c6d052e913c8a033c0198f4199b0f37f697bbe7.zip | |
Merge pull request #3658 from openshift/revert-3620-enable-docker-during-installation-and-upgrade-by-default
Revert "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, 0 insertions, 7 deletions
diff --git a/playbooks/common/openshift-cluster/initialize_openshift_version.yml b/playbooks/common/openshift-cluster/initialize_openshift_version.yml index 1f74e929f..f8981c040 100644 --- a/playbooks/common/openshift-cluster/initialize_openshift_version.yml +++ b/playbooks/common/openshift-cluster/initialize_openshift_version.yml @@ -23,9 +23,6 @@ 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 @@ -47,10 +44,6 @@ # 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 |