diff options
author | Scott Dodson <sdodson@redhat.com> | 2016-06-06 13:48:20 -0400 |
---|---|---|
committer | Scott Dodson <sdodson@redhat.com> | 2016-06-06 13:48:20 -0400 |
commit | 7af4c6823c6e86e2c8dd7b1a984ead45450b80d3 (patch) | |
tree | 7fa54a14b458b54767c81bbf996f42db6b5a4d0e /roles/openshift_master | |
parent | 7e4bb24498bb21c57ff141058caefeaa23f86549 (diff) | |
parent | 4538443750921273532d97ff653729e95bc52ad9 (diff) | |
download | openshift-7af4c6823c6e86e2c8dd7b1a984ead45450b80d3.tar.gz openshift-7af4c6823c6e86e2c8dd7b1a984ead45450b80d3.tar.bz2 openshift-7af4c6823c6e86e2c8dd7b1a984ead45450b80d3.tar.xz openshift-7af4c6823c6e86e2c8dd7b1a984ead45450b80d3.zip |
Merge pull request #1973 from ibotty/preserve_htpasswd
Add flag to manage htpasswd, or not.
Diffstat (limited to 'roles/openshift_master')
-rw-r--r-- | roles/openshift_master/tasks/main.yml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index f70eaf144..52ea8bccf 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -91,8 +91,16 @@ template: dest: "{{ item.filename }}" src: htpasswd.j2 - mode: 0600 backup: yes + when: item.kind == 'HTPasswdPasswordIdentityProvider' and openshift.master.manage_htpasswd | bool + with_items: "{{ openshift.master.identity_providers }}" + +- name: Ensure htpasswd file exists + copy: + dest: "{{ item.filename }}" + force: no + content: "" + mode: 0600 when: item.kind == 'HTPasswdPasswordIdentityProvider' with_items: "{{ openshift.master.identity_providers }}" |