diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-03-08 12:19:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-08 12:19:42 -0500 |
| commit | 1da326cb54f626242ec221e1f0d460e53e113336 (patch) | |
| tree | 4ad2d26671b282c2a3a64d5a319f8caf268d054c | |
| parent | b551ba3afbe6bf2b4888bd62dc0f5a837edadb67 (diff) | |
| parent | 534438d93e4abfb3f9b875d21c2eac37e34c8c97 (diff) | |
| download | openshift-1da326cb54f626242ec221e1f0d460e53e113336.tar.gz openshift-1da326cb54f626242ec221e1f0d460e53e113336.tar.bz2 openshift-1da326cb54f626242ec221e1f0d460e53e113336.tar.xz openshift-1da326cb54f626242ec221e1f0d460e53e113336.zip | |
Merge pull request #3597 from ingvagabund/enable-excluders-by-default
enable excluders by default
| -rw-r--r-- | roles/openshift_excluder/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_excluder/tasks/init.yml | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/roles/openshift_excluder/defaults/main.yml b/roles/openshift_excluder/defaults/main.yml index 0d275e954..7c3ae2a86 100644 --- a/roles/openshift_excluder/defaults/main.yml +++ b/roles/openshift_excluder/defaults/main.yml @@ -2,3 +2,5 @@ # keep the 'current' package or update to 'latest' if available? openshift_excluder_package_state: present docker_excluder_package_state: present + +enable_excluders: true diff --git a/roles/openshift_excluder/tasks/init.yml b/roles/openshift_excluder/tasks/init.yml index dee779925..1ea18f363 100644 --- a/roles/openshift_excluder/tasks/init.yml +++ b/roles/openshift_excluder/tasks/init.yml @@ -1,12 +1,12 @@ --- - name: Evalute if docker excluder is to be enabled set_fact: - docker_excluder_on: "{{ enable_docker_excluder | default(enable_excluders | default(false)) | bool }}" + docker_excluder_on: "{{ enable_docker_excluder | default(enable_excluders) | bool }}" - debug: var=docker_excluder_on - name: Evalute if openshift excluder is to be enabled set_fact: - openshift_excluder_on: "{{ enable_openshift_excluder | default(enable_excluders | default(false)) | bool }}" + openshift_excluder_on: "{{ enable_openshift_excluder | default(enable_excluders) | bool }}" - debug: var=openshift_excluder_on |