summaryrefslogtreecommitdiffstats
path: root/roles/openshift_excluder/tasks/enable.yml
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-03-14 10:50:43 -0400
committerGitHub <noreply@github.com>2017-03-14 10:50:43 -0400
commit8eff5bcea9097c239a3dc487289ad23e20e909b7 (patch)
treeb1570192edb48616c483000948096fde50bd9857 /roles/openshift_excluder/tasks/enable.yml
parent1956134d9d16b9e2960352d3887b985849be1fb1 (diff)
parent7dccfb7072483378f0462a447e1ae7e75e96ba3f (diff)
downloadopenshift-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 'roles/openshift_excluder/tasks/enable.yml')
-rw-r--r--roles/openshift_excluder/tasks/enable.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_excluder/tasks/enable.yml b/roles/openshift_excluder/tasks/enable.yml
index 413c7b5cf..9122c9aeb 100644
--- a/roles/openshift_excluder/tasks/enable.yml
+++ b/roles/openshift_excluder/tasks/enable.yml
@@ -13,9 +13,9 @@
- include: exclude.yml
vars:
# Enable the docker excluder only if it is overrided, resp. enabled by default (in that order)
- enable_docker_excluder: "{{ enable_docker_excluder_override | default(docker_excluder_on) | bool }}"
+ exclude_docker_excluder: "{{ enable_docker_excluder_override | default(docker_excluder_on) | bool }}"
# Enable the openshift excluder only if it is not overrided, resp. enabled by default (in that order)
- enable_openshift_excluder: "{{ not disable_openshift_excluder_override | default(not openshift_excluder_on) | bool }}"
+ exclude_openshift_excluder: "{{ not disable_openshift_excluder_override | default(not openshift_excluder_on) | bool }}"
when:
- not openshift.common.is_atomic | bool