From d7bc1807702860db17b9acdafcb2b83b2b3f91ae Mon Sep 17 00:00:00 2001
From: Steve Kuznetsov <skuznets@redhat.com>
Date: Tue, 14 Mar 2017 17:42:23 -0400
Subject: Revert "Enable docker during installation and upgrade by default"
---
roles/openshift_excluder/tasks/adjust.yml | 10 ++++------
roles/openshift_excluder/tasks/enable.yml | 4 ++--
roles/openshift_excluder/tasks/exclude.yml | 8 ++++----
roles/openshift_excluder/tasks/unexclude.yml | 10 ++++++----
4 files changed, 16 insertions(+), 16 deletions(-)
(limited to 'roles/openshift_excluder')
diff --git a/roles/openshift_excluder/tasks/adjust.yml b/roles/openshift_excluder/tasks/adjust.yml
index cbdd7785b..2535b9ea6 100644
--- a/roles/openshift_excluder/tasks/adjust.yml
+++ b/roles/openshift_excluder/tasks/adjust.yml
@@ -8,18 +8,16 @@
- include: exclude.yml
vars:
# Enable the docker excluder only if it is overrided
- # BZ #1430612: docker excluders should be enabled even during installation and upgrade
- exclude_docker_excluder: "{{ enable_docker_excluder | default(true) | bool }}"
+ enable_docker_excluder: "{{ enable_docker_excluder_override | default(false) | bool }}"
# excluder is to be disabled by default
- exclude_openshift_excluder: false
+ enable_openshift_excluder: false
# All excluders that are to be disabled are disabled
- include: unexclude.yml
vars:
# If the docker override is not set, default to the generic behaviour
- # BZ #1430612: docker excluders should be enabled even during installation and upgrade
- unexclude_docker_excluder: false
+ disable_docker_excluder: "{{ not enable_docker_excluder_override | default(not docker_excluder_on) | bool }}"
# disable openshift excluder is never overrided to be enabled
# disable it if the docker excluder is enabled
- unexclude_openshift_excluder: "{{ openshift_excluder_on | bool }}"
+ disable_openshift_excluder: "{{ openshift_excluder_on | bool }}"
when:
- not openshift.common.is_atomic | bool
diff --git a/roles/openshift_excluder/tasks/enable.yml b/roles/openshift_excluder/tasks/enable.yml
index 9122c9aeb..413c7b5cf 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)
- exclude_docker_excluder: "{{ enable_docker_excluder_override | default(docker_excluder_on) | bool }}"
+ enable_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)
- exclude_openshift_excluder: "{{ not disable_openshift_excluder_override | default(not openshift_excluder_on) | bool }}"
+ enable_openshift_excluder: "{{ not disable_openshift_excluder_override | default(not openshift_excluder_on) | bool }}"
when:
- not openshift.common.is_atomic | bool
diff --git a/roles/openshift_excluder/tasks/exclude.yml b/roles/openshift_excluder/tasks/exclude.yml
index d31351aea..af9824aae 100644
--- a/roles/openshift_excluder/tasks/exclude.yml
+++ b/roles/openshift_excluder/tasks/exclude.yml
@@ -1,20 +1,20 @@
---
# input variables:
-# - exclude_docker_excluder
-# - exclude_openshift_excluder
+# - enable_docker_excluder
+# - enable_openshift_excluder
- block:
- name: Enable docker excluder
command: "{{ openshift.common.service_type }}-docker-excluder exclude"
# if the docker override is set, it means the docker excluder needs to be enabled no matter what
# if the docker override is not set, the excluder is set based on enable_docker_excluder
when:
- - exclude_docker_excluder | default(false) | bool
+ - enable_docker_excluder | default(false) | bool
- name: Enable openshift excluder
command: "{{ openshift.common.service_type }}-excluder exclude"
# if the openshift override is set, it means the openshift excluder is disabled no matter what
# if the openshift override is not set, the excluder is set based on enable_openshift_excluder
when:
- - exclude_openshift_excluder | default(false) | bool
+ - enable_openshift_excluder | default(false) | bool
when:
- not openshift.common.is_atomic | bool
diff --git a/roles/openshift_excluder/tasks/unexclude.yml b/roles/openshift_excluder/tasks/unexclude.yml
index 9112adbac..196ca25f5 100644
--- a/roles/openshift_excluder/tasks/unexclude.yml
+++ b/roles/openshift_excluder/tasks/unexclude.yml
@@ -1,17 +1,19 @@
---
# input variables:
-# - unexclude_docker_excluder
-# - unexclude_openshift_excluder
+# - disable_docker_excluder
+# - disable_openshift_excluder
- block:
+ - include: init.yml
+
- name: disable docker excluder
command: "{{ openshift.common.service_type }}-docker-excluder unexclude"
when:
- - unexclude_docker_excluder | default(false) | bool
+ - disable_docker_excluder | default(false) | bool
- name: disable openshift excluder
command: "{{ openshift.common.service_type }}-excluder unexclude"
when:
- - unexclude_openshift_excluder | default(false) | bool
+ - disable_openshift_excluder | default(false) | bool
when:
- not openshift.common.is_atomic | bool
--
cgit v1.2.3