diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-02-10 09:13:15 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-10 09:13:15 -0500 |
| commit | f4d7caa7f0a24037adc2f56b2020e3aaec79d938 (patch) | |
| tree | 2b4dd67a7a678250c01c9e36beffa38c7b7d0cd0 /roles/openshift_metrics/tasks/generate_heapster_certificates.yaml | |
| parent | 398b72dc31788ed8fd22497761ba16e1f013a108 (diff) | |
| parent | 7d081c4b321971cc499a4fc499ad1bbaceea823f (diff) | |
| download | openshift-f4d7caa7f0a24037adc2f56b2020e3aaec79d938.tar.gz openshift-f4d7caa7f0a24037adc2f56b2020e3aaec79d938.tar.bz2 openshift-f4d7caa7f0a24037adc2f56b2020e3aaec79d938.tar.xz openshift-f4d7caa7f0a24037adc2f56b2020e3aaec79d938.zip | |
Merge pull request #3297 from jcantrill/bz_1419962_cassandra_pwd_failure
bug 1419962. fix openshift_metrics pwd issue after reinstall where ca…
Diffstat (limited to 'roles/openshift_metrics/tasks/generate_heapster_certificates.yaml')
| -rw-r--r-- | roles/openshift_metrics/tasks/generate_heapster_certificates.yaml | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/roles/openshift_metrics/tasks/generate_heapster_certificates.yaml b/roles/openshift_metrics/tasks/generate_heapster_certificates.yaml index 2449b1518..ced2df1d0 100644 --- a/roles/openshift_metrics/tasks/generate_heapster_certificates.yaml +++ b/roles/openshift_metrics/tasks/generate_heapster_certificates.yaml @@ -3,13 +3,12 @@ command: > {{ openshift.common.admin_binary }} ca create-server-cert --config={{ mktemp.stdout }}/admin.kubeconfig - --key='{{ openshift_metrics_certs_dir }}/heapster.key' - --cert='{{ openshift_metrics_certs_dir }}/heapster.cert' + --key='{{ mktemp.stdout }}/heapster.key' + --cert='{{ mktemp.stdout }}/heapster.cert' --hostnames=heapster - --signer-cert='{{ openshift_metrics_certs_dir }}/ca.crt' - --signer-key='{{ openshift_metrics_certs_dir }}/ca.key' - --signer-serial='{{ openshift_metrics_certs_dir }}/ca.serial.txt' - when: not '{{ openshift_metrics_certs_dir }}/heapster.key' | exists + --signer-cert='{{ mktemp.stdout }}/ca.crt' + --signer-key='{{ mktemp.stdout }}/ca.key' + --signer-serial='{{ mktemp.stdout }}/ca.serial.txt' - when: "'secret/heapster-secrets' not in metrics_secrets.stdout_lines" block: @@ -17,11 +16,11 @@ slurp: src={{ item }} register: heapster_secret with_items: - - "{{ openshift_metrics_certs_dir }}/heapster.cert" - - "{{ openshift_metrics_certs_dir }}/heapster.key" + - "{{ mktemp.stdout }}/heapster.cert" + - "{{ mktemp.stdout }}/heapster.key" - "{{ client_ca }}" vars: - custom_ca: "{{ openshift_metrics_certs_dir }}/heapster_client_ca.crt" + custom_ca: "{{ mktemp.stdout }}/heapster_client_ca.crt" default_ca: "{{ openshift.common.config_base }}/master/ca-bundle.crt" client_ca: "{{ custom_ca|exists|ternary(custom_ca, default_ca) }}" - name: generate heapster secret template |