summaryrefslogtreecommitdiffstats
path: root/roles/openshift_excluder/defaults
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-05-18 09:33:51 -0500
committerGitHub <noreply@github.com>2017-05-18 09:33:51 -0500
commited988a68bd6edce0d91e2aa0b20e6dd8327863be (patch)
tree1ff0cc5daa570522df7b262f6143b195ea74bc2a /roles/openshift_excluder/defaults
parentb1c0247fdeb01f46e885c57cd272786d00ac8490 (diff)
parentc5c222eddb0b8950995105c4c406f5a5d0bfbacd (diff)
downloadopenshift-ed988a68bd6edce0d91e2aa0b20e6dd8327863be.tar.gz
openshift-ed988a68bd6edce0d91e2aa0b20e6dd8327863be.tar.bz2
openshift-ed988a68bd6edce0d91e2aa0b20e6dd8327863be.tar.xz
openshift-ed988a68bd6edce0d91e2aa0b20e6dd8327863be.zip
Merge pull request #4176 from mtnbikenc/refactor-openshift_excluders
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_excluder/defaults')
-rw-r--r--roles/openshift_excluder/defaults/main.yml19
1 files changed, 16 insertions, 3 deletions
diff --git a/roles/openshift_excluder/defaults/main.yml b/roles/openshift_excluder/defaults/main.yml
index 7c3ae2a86..d4f151142 100644
--- a/roles/openshift_excluder/defaults/main.yml
+++ b/roles/openshift_excluder/defaults/main.yml
@@ -1,6 +1,19 @@
---
# keep the 'current' package or update to 'latest' if available?
-openshift_excluder_package_state: present
-docker_excluder_package_state: present
+r_openshift_excluder_package_state: present
+r_openshift_excluder_docker_package_state: present
-enable_excluders: true
+# Legacy variables are included for backwards compatibility with v3.5
+# Inventory variables Legacy
+# openshift_enable_excluders enable_excluders
+# openshift_enable_openshift_excluder enable_openshift_excluder
+# openshift_enable_docker_excluder enable_docker_excluder
+r_openshift_excluder_enable_excluders: "{{ openshift_enable_excluders | default(enable_excluders) | default(true) }}"
+r_openshift_excluder_enable_openshift_excluder: "{{ openshift_enable_openshift_excluder | default(enable_openshift_excluder) | default(r_openshift_excluder_enable_excluders) }}"
+r_openshift_excluder_enable_docker_excluder: "{{ openshift_enable_docker_excluder | default(enable_docker_excluder) | default(r_openshift_excluder_enable_excluders) }}"
+
+# Default action when calling this role
+r_openshift_excluder_action: enable
+
+# When upgrading, this variable should be set to true when calling the role
+r_openshift_excluder_verify_upgrade: false