summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master_facts
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2016-04-07 02:47:27 -0400
committerJason DeTiberus <jdetiber@redhat.com>2016-04-25 17:35:27 -0400
commit2ed23a9326056a9d23b153f0ddb9ae9956f3d75b (patch)
tree681c5a0f477402843706c0f98cea133c5339b048 /roles/openshift_master_facts
parent3262718f8fc4658a3b223823244f1f78cb0eb6c8 (diff)
downloadopenshift-2ed23a9326056a9d23b153f0ddb9ae9956f3d75b.tar.gz
openshift-2ed23a9326056a9d23b153f0ddb9ae9956f3d75b.tar.bz2
openshift-2ed23a9326056a9d23b153f0ddb9ae9956f3d75b.tar.xz
openshift-2ed23a9326056a9d23b153f0ddb9ae9956f3d75b.zip
Add support for setting identity provider custom values
- htpasswd users - ldap ca file - openid ca file - request_header ca file
Diffstat (limited to 'roles/openshift_master_facts')
-rw-r--r--roles/openshift_master_facts/tasks/main.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/roles/openshift_master_facts/tasks/main.yml b/roles/openshift_master_facts/tasks/main.yml
index a020fdb41..254664e57 100644
--- a/roles/openshift_master_facts/tasks/main.yml
+++ b/roles/openshift_master_facts/tasks/main.yml
@@ -42,6 +42,10 @@
access_token_max_seconds: "{{ openshift_master_access_token_max_seconds | default(None) }}"
auth_token_max_seconds: "{{ openshift_master_auth_token_max_seconds | default(None) }}"
identity_providers: "{{ openshift_master_identity_providers | default(None) }}"
+ htpasswd_users: "{{ openshift_master_htpasswd_users | default(lookup('file', openshift_master_htpasswd_file) | oo_htpasswd_users_from_file if openshift_master_htpasswd_file is defined else None) }}"
+ ldap_ca: "{{ openshift_master_ldap_ca | default(lookup('file', openshift_master_ldap_ca_file) if openshift_master_ldap_ca_file is defined else None) }}"
+ openid_ca: "{{ openshift_master_openid_ca | default(lookup('file', openshift_master_openid_ca_file) if openshift_master_openid_ca_file is defined else None) }}"
+ request_header_ca: "{{ openshift_master_request_header_ca | default(lookup('file', openshift_master_request_header_ca_file) if openshift_master_request_header_ca_file is defined else None) }}"
registry_url: "{{ oreg_url | default(None) }}"
oauth_grant_method: "{{ openshift_master_oauth_grant_method | default(None) }}"
sdn_cluster_network_cidr: "{{ osm_cluster_network_cidr | default(None) }}"