starlingx
/
ansible-playbooks
Code Issues Proposed changes

Merge "Fix system-local-ca ca.crt during upgrade"

This commit is contained in:
Zuul 2024-05-02 15:26:37 +00:00 committed by Gerrit Code Review
parent 752fc5c8fc d76bdfa929
commit 576620ad62
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbookconfig/src/playbooks/roles/common/generate-platform-certificates-template/templates/platform_certificates.yml.j2
View File

@ -3,7 +3,7 @@
---
apiVersion: v1
data:
ca.crt: "{{ system_root_ca_cert | default(system_local_ca_cert) }}"
ca.crt: "{{ system_root_ca_cert | default('', true) }}"
tls.crt: "{{ system_local_ca_cert }}"
tls.key: "{{ system_local_ca_key }}"
kind: Secret

2
playbookconfig/src/playbooks/roles/common/install-platform-certificates/tasks/retrieve-system-local-ca-data.yml
View File

@ -59,7 +59,7 @@
- name: Set system-local-ca data
set_fact:
system_root_ca_cert: "{{ ca_cert_result.stdout | default(cert_result.stdout, true) }}"
system_root_ca_cert: "{{ ca_cert_result.stdout | default('', true) }}"
system_local_ca_cert: "{{ cert_result.stdout }}"
system_local_ca_key: "{{ key_result.stdout }}"
system_local_ca_data_obtained: true