diff options
| author | Tobias Florek <tob@butter.sh> | 2016-06-02 17:25:10 +0200 |
|---|---|---|
| committer | Tobias Florek <tob@butter.sh> | 2016-06-02 17:25:10 +0200 |
| commit | e7bba72cd95159179b5afd4f2b9e6f6d48cba0df (patch) | |
| tree | 4e6af2480a7d85ad1f285ff207ef4a43017852a3 | |
| parent | c4c6685855a9dc6b4c698465b799c72d6a4f13bd (diff) | |
| download | openshift-e7bba72cd95159179b5afd4f2b9e6f6d48cba0df.tar.gz openshift-e7bba72cd95159179b5afd4f2b9e6f6d48cba0df.tar.bz2 openshift-e7bba72cd95159179b5afd4f2b9e6f6d48cba0df.tar.xz openshift-e7bba72cd95159179b5afd4f2b9e6f6d48cba0df.zip | |
Add flag to manage htpasswd, or not.
Setting `openshift_master_manage_htpasswd` falsy will disable managing
the htpasswd file. It won't get overwritten/generated.
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_master_facts/tasks/main.yml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 63a54a0d9..8ae169dfb 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -93,7 +93,7 @@ src: htpasswd.j2 mode: 0600 backup: yes - when: item.kind == 'HTPasswdPasswordIdentityProvider' + when: item.kind == 'HTPasswdPasswordIdentityProvider' and openshift.master.manage_htpasswd | bool with_items: "{{ openshift.master.identity_providers }}" - name: Create the ldap ca file if needed diff --git a/roles/openshift_master_facts/tasks/main.yml b/roles/openshift_master_facts/tasks/main.yml index 896dd5e35..d51c5a0a3 100644 --- a/roles/openshift_master_facts/tasks/main.yml +++ b/roles/openshift_master_facts/tasks/main.yml @@ -42,6 +42,7 @@ 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) }}" + manage_htpasswd: "{{ openshift_master_manage_htpasswd | default(true) }}" 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) }}" |