diff options
author | Bruno Barcarol GuimarĂ£es <bbarcaro@redhat.com> | 2016-12-05 16:34:32 +0000 |
---|---|---|
committer | Jeff Cantrill <jcantril@redhat.com> | 2017-01-17 11:45:04 -0500 |
commit | b6ce0464142403785a7ba8eae664286082f4d30e (patch) | |
tree | 3673f52a387edc2894ac11c23fad1253b1f1c9be /roles/openshift_metrics/tasks/install_hawkular.yaml | |
parent | f3f1f610c9e0fdf8115dd8ea61e647080ad42006 (diff) | |
download | openshift-b6ce0464142403785a7ba8eae664286082f4d30e.tar.gz openshift-b6ce0464142403785a7ba8eae664286082f4d30e.tar.bz2 openshift-b6ce0464142403785a7ba8eae664286082f4d30e.tar.xz openshift-b6ce0464142403785a7ba8eae664286082f4d30e.zip |
Custom certificates (#5)
* Generate secrets on a persistent directory.
* Split certificate generation files.
* Custom certificates.
* Minor fixes.
- use `slurp` instead of `shell: base64`
- fix route hostname
* Updates on origin-metrics.
Diffstat (limited to 'roles/openshift_metrics/tasks/install_hawkular.yaml')
-rw-r--r-- | roles/openshift_metrics/tasks/install_hawkular.yaml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/roles/openshift_metrics/tasks/install_hawkular.yaml b/roles/openshift_metrics/tasks/install_hawkular.yaml index 9a39cce34..d7a029fa8 100644 --- a/roles/openshift_metrics/tasks/install_hawkular.yaml +++ b/roles/openshift_metrics/tasks/install_hawkular.yaml @@ -39,6 +39,9 @@ size: "{{ openshift_metrics_hawkular_cassandra_pv_size }}" with_sequence: count={{ openshift_metrics_hawkular_cassandra_nodes }} when: openshift_metrics_hawkular_cassandra_storage_type == 'dynamic' +- name: read hawkular-metrics route destination ca certificate + slurp: src={{ openshift_metrics_certs_dir }}/ca.crt + register: metrics_route_dest_ca_cert - name: generate the hawkular-metrics route template: src: route.j2 @@ -47,11 +50,10 @@ name: hawkular-metrics labels: metrics-infra: hawkular-metrics - host: hawkular-metrics.example.com + host: "{{ openshift_metrics_hawkular_metrics_hostname }}" to: kind: Service name: hawkular-metrics tls: termination: reencrypt - destination_ca_certificate: > - {{ hawkular_metrics_secret.results[6].stdout|b64decode }} + destination_ca_certificate: "{{ metrics_route_dest_ca_cert.content }}" |