diff options
| author | Jan Chaloupka <jchaloup@redhat.com> | 2017-03-09 15:41:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-09 15:41:18 +0100 |
| commit | 39e84a426f511d0f415e9b241de0f97bce4faa46 (patch) | |
| tree | 0def698f7d2d0c55a197f054a5256b1feed4f042 /roles | |
| parent | 29886dbe6054aa46f948b0e38394726343abc2a2 (diff) | |
| parent | d83390624f1a48444ddebb98471b254f3b968bd0 (diff) | |
| download | openshift-39e84a426f511d0f415e9b241de0f97bce4faa46.tar.gz openshift-39e84a426f511d0f415e9b241de0f97bce4faa46.tar.bz2 openshift-39e84a426f511d0f415e9b241de0f97bce4faa46.tar.xz openshift-39e84a426f511d0f415e9b241de0f97bce4faa46.zip | |
Merge pull request #3607 from ingvagabund/extend-excluders-to-containerized-ocp
extend the excluders to containerized deployment
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_excluder/tasks/adjust.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_excluder/tasks/enable.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_excluder/tasks/exclude.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_excluder/tasks/install.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_excluder/tasks/status.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_excluder/tasks/unexclude.yml | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/roles/openshift_excluder/tasks/adjust.yml b/roles/openshift_excluder/tasks/adjust.yml index 6f4070c3d..2535b9ea6 100644 --- a/roles/openshift_excluder/tasks/adjust.yml +++ b/roles/openshift_excluder/tasks/adjust.yml @@ -20,4 +20,4 @@ # disable it if the docker excluder is enabled disable_openshift_excluder: "{{ openshift_excluder_on | bool }}" when: - - not openshift.common.is_containerized | bool + - not openshift.common.is_atomic | bool diff --git a/roles/openshift_excluder/tasks/enable.yml b/roles/openshift_excluder/tasks/enable.yml index ef6fc4a01..413c7b5cf 100644 --- a/roles/openshift_excluder/tasks/enable.yml +++ b/roles/openshift_excluder/tasks/enable.yml @@ -18,4 +18,4 @@ enable_openshift_excluder: "{{ not disable_openshift_excluder_override | default(not openshift_excluder_on) | bool }}" when: - - not openshift.common.is_containerized | bool + - not openshift.common.is_atomic | bool diff --git a/roles/openshift_excluder/tasks/exclude.yml b/roles/openshift_excluder/tasks/exclude.yml index ee0ad8a0b..af9824aae 100644 --- a/roles/openshift_excluder/tasks/exclude.yml +++ b/roles/openshift_excluder/tasks/exclude.yml @@ -17,4 +17,4 @@ when: - enable_openshift_excluder | default(false) | bool when: - - not openshift.common.is_containerized | bool + - not openshift.common.is_atomic | bool diff --git a/roles/openshift_excluder/tasks/install.yml b/roles/openshift_excluder/tasks/install.yml index 01fe5da55..dcc8df0cb 100644 --- a/roles/openshift_excluder/tasks/install.yml +++ b/roles/openshift_excluder/tasks/install.yml @@ -18,4 +18,4 @@ when: - install_openshift_excluder | default(true) | bool when: - - not openshift.common.is_containerized | bool + - not openshift.common.is_atomic | bool diff --git a/roles/openshift_excluder/tasks/status.yml b/roles/openshift_excluder/tasks/status.yml index 3b6821244..363ccdbea 100644 --- a/roles/openshift_excluder/tasks/status.yml +++ b/roles/openshift_excluder/tasks/status.yml @@ -81,4 +81,4 @@ - "{{ docker_excluder_on }}" when: - - not openshift.common.is_containerized | bool + - not openshift.common.is_atomic | bool diff --git a/roles/openshift_excluder/tasks/unexclude.yml b/roles/openshift_excluder/tasks/unexclude.yml index 4df92bc65..196ca25f5 100644 --- a/roles/openshift_excluder/tasks/unexclude.yml +++ b/roles/openshift_excluder/tasks/unexclude.yml @@ -16,4 +16,4 @@ - disable_openshift_excluder | default(false) | bool when: - - not openshift.common.is_containerized | bool + - not openshift.common.is_atomic | bool |