summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-08-03 07:56:37 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2015-08-03 07:56:37 -0400
commitbec613a2237df25164de03524414224779fcab4c (patch)
tree5fc13929b2468ff5f79826b871a027c069932ebe
parent3c2893290640865cce15f6093a9ab2f11c294acd (diff)
parenta000874e90000f15ea7aed09344eb2c641d27008 (diff)
downloadopenshift-bec613a2237df25164de03524414224779fcab4c.tar.gz
openshift-bec613a2237df25164de03524414224779fcab4c.tar.bz2
openshift-bec613a2237df25164de03524414224779fcab4c.tar.xz
openshift-bec613a2237df25164de03524414224779fcab4c.zip
Merge pull request #409 from abutcher/ldap-identity-provider
Add LDAPPasswordIdentityProvider bits to identity_provider_config macro.
-rw-r--r--roles/openshift_master/templates/v1_partials/oauthConfig.j214
1 files changed, 14 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/v1_partials/oauthConfig.j2 b/roles/openshift_master/templates/v1_partials/oauthConfig.j2
index f6fd88c65..4ca644876 100644
--- a/roles/openshift_master/templates/v1_partials/oauthConfig.j2
+++ b/roles/openshift_master/templates/v1_partials/oauthConfig.j2
@@ -10,6 +10,20 @@
{{ key }}: {{ identity_provider[key] }}"
{% endif %}
{% endfor %}
+{% elif identity_provider.kind == 'LDAPPasswordIdentityProvider' %}
+ attributes:
+{% for attribute_key in identity_provider.attributes %}
+ {{ attribute_key }}:
+{% for attribute_value in identity_provider.attributes[attribute_key] %}
+ - {{ attribute_value }}
+{% endfor %}
+{% endfor %}
+{% for key in ('bindDN', 'bindPassword', 'ca') %}
+ {{ key }}: "{{ identity_provider[key] }}"
+{% endfor %}
+{% for key in ('insecure', 'url') %}
+ {{ key }}: {{ identity_provider[key] }}
+{% endfor %}
{% elif identity_provider.kind == 'RequestHeaderIdentityProvider' %}
headers: {{ identity_provider.headers }}
{% if 'clientCA' in identity_provider %}