summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-05-04 10:30:42 -0500
committerGitHub <noreply@github.com>2017-05-04 10:30:42 -0500
commita04128cf36792640a84ad0e1914922dffbf2bd5c (patch)
tree2d2ad97af33d4d51b5116517458ac0937356a5e2
parent03f33dae7238e0ffaac4f85d89af25be57dc5ecd (diff)
parent845c523efbd89c3bd1b601ca0589e13e81651f1d (diff)
downloadopenshift-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
-rw-r--r--openshift-ansible.spec9
-rw-r--r--roles/openshift_metrics/tasks/generate_hawkular_certificates.yaml16
2 files changed, 14 insertions, 11 deletions
diff --git a/openshift-ansible.spec b/openshift-ansible.spec
index b6fd74c1f..10a04a519 100644
--- a/openshift-ansible.spec
+++ b/openshift-ansible.spec
@@ -25,6 +25,7 @@ Requires: openshift-ansible-docs = %{version}
Requires: java-1.8.0-openjdk-headless
Requires: httpd-tools
Requires: libselinux-python
+Requires: python-passlib
%description
Openshift and Atomic Enterprise Ansible
@@ -316,17 +317,17 @@ Atomic OpenShift Utilities includes
- Bump ansible rpm dependency to 2.2.2.0 (sdodson@redhat.com)
* Mon May 01 2017 Jenkins CD Merge Bot <tdawson@redhat.com> 3.6.48-1
--
+-
* Mon May 01 2017 Jenkins CD Merge Bot <tdawson@redhat.com> 3.6.47-1
--
+-
* Mon May 01 2017 Jenkins CD Merge Bot <tdawson@redhat.com> 3.6.46-1
- Contrib: Hook to verify modules match assembled fragments
(tbielawa@redhat.com)
* Mon May 01 2017 Jenkins CD Merge Bot <tdawson@redhat.com> 3.6.45-1
--
+-
* Sun Apr 30 2017 Jenkins CD Merge Bot <tdawson@redhat.com> 3.6.44-1
- Refactor etcd roles (jchaloup@redhat.com)
@@ -397,7 +398,7 @@ Atomic OpenShift Utilities includes
- Remove v1.5 and v1.6 metrics/logging templates (sdodson@redhat.com)
* Sun Apr 23 2017 Jenkins CD Merge Bot <tdawson@redhat.com> 3.6.35-1
--
+-
* Fri Apr 21 2017 Jenkins CD Merge Bot <tdawson@redhat.com> 3.6.34-1
- GlusterFS: provide default for groups.oo_glusterfs_to_config in with_items
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