From 3db1b63ab35cac6821c8795f7a84ef51407fbb6f Mon Sep 17 00:00:00 2001 From: Monis Khan Date: Wed, 14 Feb 2018 13:33:40 -0500 Subject: Revert "Bug 1512825 - add mux pod failed for Serial number 02 has already been issued" This reverts commit ac23e6e362d8758032c1dd573d0ff6a958445df5. That commit introduced a backwards incompatible change to how the commands run. This undoes that. The original change was not required to prevent overwriting of the serial file. Bug 1512825 --- roles/openshift_logging/tasks/generate_certs.yaml | 2 +- roles/openshift_logging/tasks/procure_server_certs.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/openshift_logging/tasks/generate_certs.yaml b/roles/openshift_logging/tasks/generate_certs.yaml index a40449bf6..0d7f8c056 100644 --- a/roles/openshift_logging/tasks/generate_certs.yaml +++ b/roles/openshift_logging/tasks/generate_certs.yaml @@ -19,7 +19,7 @@ command: > {{ openshift_client_binary }} adm --config={{ mktemp.stdout }}/admin.kubeconfig ca create-signer-cert --key={{generated_certs_dir}}/ca.key --cert={{generated_certs_dir}}/ca.crt - --serial={{generated_certs_dir}}/ca.serial.txt --name=logging-signer-test --overwrite=false + --serial={{generated_certs_dir}}/ca.serial.txt --name=logging-signer-test check_mode: no when: - not ca_key_file.stat.exists diff --git a/roles/openshift_logging/tasks/procure_server_certs.yaml b/roles/openshift_logging/tasks/procure_server_certs.yaml index d28d1d160..bc817075d 100644 --- a/roles/openshift_logging/tasks/procure_server_certs.yaml +++ b/roles/openshift_logging/tasks/procure_server_certs.yaml @@ -30,7 +30,7 @@ {{ openshift_client_binary }} adm --config={{ mktemp.stdout }}/admin.kubeconfig ca create-server-cert --key={{generated_certs_dir}}/{{cert_info.procure_component}}.key --cert={{generated_certs_dir}}/{{cert_info.procure_component}}.crt --hostnames={{cert_info.hostnames|quote}} --signer-cert={{generated_certs_dir}}/ca.crt --signer-key={{generated_certs_dir}}/ca.key - --signer-serial={{generated_certs_dir}}/ca.serial.txt --overwrite=false + --signer-serial={{generated_certs_dir}}/ca.serial.txt check_mode: no when: - cert_info.hostnames is defined -- cgit v1.2.1