diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-04 10:30:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-04 10:30:42 -0500 |
| commit | a04128cf36792640a84ad0e1914922dffbf2bd5c (patch) | |
| tree | 2d2ad97af33d4d51b5116517458ac0937356a5e2 /roles/openshift_metrics/tasks | |
| parent | 03f33dae7238e0ffaac4f85d89af25be57dc5ecd (diff) | |
| parent | 845c523efbd89c3bd1b601ca0589e13e81651f1d (diff) | |
| download | openshift-a04128cf36792640a84ad0e1914922dffbf2bd5c.tar.gz openshift-a04128cf36792640a84ad0e1914922dffbf2bd5c.tar.bz2 openshift-a04128cf36792640a84ad0e1914922dffbf2bd5c.tar.xz openshift-a04128cf36792640a84ad0e1914922dffbf2bd5c.zip | |
Merge pull request #4071 from ewolinetz/cherry_pick_htpasswd
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_metrics/tasks')
| -rw-r--r-- | roles/openshift_metrics/tasks/generate_hawkular_certificates.yaml | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/roles/openshift_metrics/tasks/generate_hawkular_certificates.yaml b/roles/openshift_metrics/tasks/generate_hawkular_certificates.yaml index 07b7eca33..fb4fe2f03 100644 --- a/roles/openshift_metrics/tasks/generate_hawkular_certificates.yaml +++ b/roles/openshift_metrics/tasks/generate_hawkular_certificates.yaml @@ -14,20 +14,22 @@ changed_when: no - name: generate password for hawkular metrics - local_action: copy dest="{{ local_tmp.stdout}}/{{ item }}.pwd" content="{{ 15 | oo_random_word }}" + local_action: copy dest="{{ local_tmp.stdout }}/{{ item }}.pwd" content="{{ 15 | oo_random_word }}" with_items: - hawkular-metrics +- local_action: slurp src="{{ local_tmp.stdout }}/hawkular-metrics.pwd" + register: hawkular_metrics_pwd + no_log: true + - name: generate htpasswd file for hawkular metrics - local_action: > - shell htpasswd -ci - '{{ local_tmp.stdout }}/hawkular-metrics.htpasswd' hawkular - < '{{ local_tmp.stdout }}/hawkular-metrics.pwd' + local_action: htpasswd path="{{ local_tmp.stdout }}/hawkular-metrics.htpasswd" name=hawkular password="{{ hawkular_metrics_pwd.content | b64decode }}" + no_log: true - name: copy local generated passwords to target copy: - src: "{{local_tmp.stdout}}/{{item}}" - dest: "{{mktemp.stdout}}/{{item}}" + src: "{{ local_tmp.stdout }}/{{ item }}" + dest: "{{ mktemp.stdout }}/{{ item }}" with_items: - hawkular-metrics.pwd - hawkular-metrics.htpasswd |