소스 검색

Merge pull request #3374 from mwringe/hawkular-metrics-certificates

Fix issues with Hawkular Metrics certificates
Scott Dodson 8 년 전
부모
커밋
0cdca379b1
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      roles/openshift_metrics/tasks/generate_certificates.yaml
  2. 1 1
      roles/openshift_metrics/tasks/generate_hawkular_certificates.yaml

+ 1 - 1
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

+ 1 - 1
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