summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-02-16 09:54:22 -0500
committerGitHub <noreply@github.com>2017-02-16 09:54:22 -0500
commit0cdca379b1d2fa3b36a01ec129ce6303fc31fe97 (patch)
tree033dad132a30f6dbab8dc347ba4533e6e4316e6b
parent963752d172d0be03806b91089984f1ee5816f82d (diff)
parent9a4e3cc9823ca2350f9b15f83317327b5d08a1cd (diff)
downloadopenshift-0cdca379b1d2fa3b36a01ec129ce6303fc31fe97.tar.gz
openshift-0cdca379b1d2fa3b36a01ec129ce6303fc31fe97.tar.bz2
openshift-0cdca379b1d2fa3b36a01ec129ce6303fc31fe97.tar.xz
openshift-0cdca379b1d2fa3b36a01ec129ce6303fc31fe97.zip
Merge pull request #3374 from mwringe/hawkular-metrics-certificates
Fix issues with Hawkular Metrics certificates
-rw-r--r--roles/openshift_metrics/tasks/generate_certificates.yaml2
-rw-r--r--roles/openshift_metrics/tasks/generate_hawkular_certificates.yaml2
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_metrics/tasks/generate_certificates.yaml b/roles/openshift_metrics/tasks/generate_certificates.yaml
index f7cba0093..7af3f9467 100644
--- a/roles/openshift_metrics/tasks/generate_certificates.yaml
+++ b/roles/openshift_metrics/tasks/generate_certificates.yaml
@@ -6,6 +6,6 @@
--key='{{ mktemp.stdout }}/ca.key'
--cert='{{ mktemp.stdout }}/ca.crt'
--serial='{{ mktemp.stdout }}/ca.serial.txt'
- --name="metrics-signer@$(date +%s)"
+ --name="metrics-signer@{{lookup('pipe','date +%s')}}"
- include: generate_hawkular_certificates.yaml
diff --git a/roles/openshift_metrics/tasks/generate_hawkular_certificates.yaml b/roles/openshift_metrics/tasks/generate_hawkular_certificates.yaml
index 854697abb..9e7140bfa 100644
--- a/roles/openshift_metrics/tasks/generate_hawkular_certificates.yaml
+++ b/roles/openshift_metrics/tasks/generate_hawkular_certificates.yaml
@@ -3,7 +3,7 @@
include: setup_certificate.yaml
vars:
component: hawkular-metrics
- hostnames: "hawkular-metrics,{{ openshift_metrics_hawkular_hostname }}"
+ hostnames: "hawkular-metrics,hawkular-metrics.{{ openshift_metrics_project }}.svc.cluster.local,{{ openshift_metrics_hawkular_hostname }}"
changed_when: no
- name: generate hawkular-cassandra certificates