summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master_facts
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-04-06 16:19:42 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-04-06 16:19:42 -0400
commitfa4f0f35befc30c43a272defff2a1792893ff1ba (patch)
treee22ce3202662a643f9c4d17bd0b210e9c01b2db8 /roles/openshift_master_facts
parentb67f7b41fd4efb94d8966f84b8ed08b75f4c991e (diff)
parent6003856b95031aa8e0c31977e9485ff3d842810e (diff)
downloadopenshift-fa4f0f35befc30c43a272defff2a1792893ff1ba.tar.gz
openshift-fa4f0f35befc30c43a272defff2a1792893ff1ba.tar.bz2
openshift-fa4f0f35befc30c43a272defff2a1792893ff1ba.tar.xz
openshift-fa4f0f35befc30c43a272defff2a1792893ff1ba.zip
Merge pull request #1660 from dgoodwin/admission-config
Add support for templating master admissionConfig.
Diffstat (limited to 'roles/openshift_master_facts')
-rw-r--r--roles/openshift_master_facts/tasks/main.yml7
1 files changed, 7 insertions, 0 deletions
diff --git a/roles/openshift_master_facts/tasks/main.yml b/roles/openshift_master_facts/tasks/main.yml
index 2a3e38af4..f43b8c59d 100644
--- a/roles/openshift_master_facts/tasks/main.yml
+++ b/roles/openshift_master_facts/tasks/main.yml
@@ -65,3 +65,10 @@
master_image: "{{ osm_image | default(None) }}"
scheduler_predicates: "{{ openshift_master_scheduler_predicates | default(None) }}"
scheduler_priorities: "{{ openshift_master_scheduler_priorities | default(None) }}"
+ admission_plugin_order: "{{openshift_master_admission_plugin_order | default(None) }}"
+ admission_plugin_config: "{{openshift_master_admission_plugin_config | default(None) }}"
+ kube_admission_plugin_order: "{{openshift_master_kube_admission_plugin_order | default(None) }}"
+ kube_admission_plugin_config: "{{openshift_master_kube_admission_plugin_config | default(None) }}"
+ oauth_template: "{{ openshift_master_oauth_template | default(None) }}" # deprecated in origin 1.2 / OSE 3.2
+ oauth_templates: "{{ openshift_master_oauth_templates | default(None) }}"
+ oauth_always_show_provider_selection: "{{ openshift_master_oauth_always_show_provider_selection | default(None) }}"