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/tasks | |
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/tasks')
-rw-r--r-- | roles/openshift_master/tasks/main.yml | 33 |
1 files changed, 30 insertions, 3 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 18a42bf93..fee6d3924 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -88,14 +88,41 @@ with_items: openshift.master.identity_providers - name: Create the htpasswd file if needed - copy: + template: dest: "{{ item.filename }}" - content: "" + src: htpasswd.j2 mode: 0600 - force: no + backup: yes when: item.kind == 'HTPasswdPasswordIdentityProvider' with_items: openshift.master.identity_providers +- name: Create the ldap ca file if needed + copy: + dest: "{{ item.ca if 'ca' in item and '/' in item.ca else openshift_master_config_dir ~ '/' ~ item.ca | default('ldap_ca.crt') }}" + content: "{{ openshift.master.ldap_ca }}" + mode: 0600 + backup: yes + when: openshift.master.ldap_ca is defined and item.kind == 'LDAPPasswordIdentityProvider' + with_items: openshift.master.identity_providers + +- name: Create the openid ca file if needed + copy: + dest: "{{ item.ca if 'ca' in item and '/' in item.ca else openshift_master_config_dir ~ '/' ~ item.ca | default('openid_ca.crt') }}" + content: "{{ openshift.master.openid_ca }}" + mode: 0600 + backup: yes + when: openshift.master.openid_ca is defined and item.kind == 'OpenIDIdentityProvider' and item.ca | default('') != '' + with_items: openshift.master.identity_providers + +- name: Create the request header ca file if needed + copy: + dest: "{{ item.clientCA if 'clientCA' in item and '/' in item.clientCA else openshift_master_config_dir ~ '/' ~ item.clientCA | default('request_header_ca.crt') }}" + content: "{{ openshift.master.request_header_ca }}" + mode: 0600 + backup: yes + when: openshift.master.request_header_ca is defined and item.kind == 'RequestHeaderIdentityProvider' and item.clientCA | default('') != '' + with_items: openshift.master.identity_providers + - name: Install the systemd units include: systemd_units.yml |