diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-02-14 15:49:24 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-14 15:49:24 -0800 |
| commit | 5160996a7bca9053720cd6230537f7acacaa2134 (patch) | |
| tree | 48a1b268770bc3d8d4818c5cc2bc9fa5ceb2e36b | |
| parent | b62c397f0625b9ff3654347a1777ed2277942712 (diff) | |
| parent | 3db1b63ab35cac6821c8795f7a84ef51407fbb6f (diff) | |
| download | openshift-5160996a7bca9053720cd6230537f7acacaa2134.tar.gz openshift-5160996a7bca9053720cd6230537f7acacaa2134.tar.bz2 openshift-5160996a7bca9053720cd6230537f7acacaa2134.tar.xz openshift-5160996a7bca9053720cd6230537f7acacaa2134.zip | |
Merge pull request #7155 from enj/enj/i/revert_overwrite_certs/1512825
Automatic merge from submit-queue.
Revert "Bug 1512825 - add mux pod failed for Serial number 02 has already been issued"
@sdodson @nhosoi This reverts #6798 as we are not changing the default in origin https://github.com/openshift/origin/pull/18405.
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
| -rw-r--r-- | roles/openshift_logging/tasks/generate_certs.yaml | 2 | ||||
| -rw-r--r-- | 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 |