diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-04-26 10:03:05 -0400 |
|---|---|---|
| committer | Jason DeTiberus <detiber@gmail.com> | 2016-04-26 10:03:05 -0400 |
| commit | 44407f04615073f1ffde4bf31f6a2a5894c7bafc (patch) | |
| tree | 19281b0063447251e82fa14ae65f3f14d0dff603 /roles/openshift_master_facts | |
| parent | 7c6d0d70e2371bd9abb6feb4e6c098ae4ddb5143 (diff) | |
| parent | 2ed23a9326056a9d23b153f0ddb9ae9956f3d75b (diff) | |
| download | openshift-44407f04615073f1ffde4bf31f6a2a5894c7bafc.tar.gz openshift-44407f04615073f1ffde4bf31f6a2a5894c7bafc.tar.bz2 openshift-44407f04615073f1ffde4bf31f6a2a5894c7bafc.tar.xz openshift-44407f04615073f1ffde4bf31f6a2a5894c7bafc.zip | |
Merge pull request #1726 from detiber/htpasswd_users
Add support for setting identity provider custom values
Diffstat (limited to 'roles/openshift_master_facts')
| -rw-r--r-- | roles/openshift_master_facts/tasks/main.yml | 4 |
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 d39c89516..090511864 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) }}" |