opendev/system-config
Code Issues Proposed changes

Correct internal tracing server cert name

Browse Source 
We have instructed zuul to connect to tracing.opendev.org, but
we are generating a certificate using opendev-ca with
S=tracing01.opendev.org.  Update the certificate with the correct
subject.

This also corrects the opendev-ca role which assumed that the cert
filename would always be inventory_hostname.

Change-Id: I9b6b0534f058d386e01910bb7efc30312f3d72ad
This commit is contained in:
James E. Blair 2022-09-28 10:04:32 -07:00
parent 7689c561f2
commit 8492420407
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
playbooks/roles/jaeger/tasks/main.yaml
View File

@ -37,6 +37,7 @@
name: opendev-ca name: opendev-ca
vars: vars:
opendev_ca_name: jaeger opendev_ca_name: jaeger
opendev_ca_server: "tracing.opendev.org"
opendev_ca_cert_dir: /var/jaeger/tls opendev_ca_cert_dir: /var/jaeger/tls
opendev_ca_cert_dir_owner: "{{ jaeger_user }}" opendev_ca_cert_dir_owner: "{{ jaeger_user }}"
opendev_ca_cert_dir_group: "{{ jaeger_group }}" opendev_ca_cert_dir_group: "{{ jaeger_group }}"

6
playbooks/roles/opendev-ca/tasks/main.yaml
View File

@ -35,15 +35,15 @@
- name: Copy TLS cert into place - name: Copy TLS cert into place
copy: copy:
src: "{{ opendev_ca_root }}/certs/{{ inventory_hostname }}.pem" src: "{{ opendev_ca_root }}/certs/{{ opendev_ca_server }}.pem"
dest: "{{ opendev_ca_cert_dir }}/certs/cert.pem" dest: "{{ opendev_ca_cert_dir }}/certs/cert.pem"
- name: Copy TLS key into place - name: Copy TLS key into place
copy: copy:
src: "{{ opendev_ca_root }}/keys/{{ inventory_hostname }}key.pem" src: "{{ opendev_ca_root }}/keys/{{ opendev_ca_server }}key.pem"
dest: "{{ opendev_ca_cert_dir }}/keys/key.pem" dest: "{{ opendev_ca_cert_dir }}/keys/key.pem"
- name: Copy TLS keystore into place - name: Copy TLS keystore into place
copy: copy:
src: "{{ opendev_ca_root }}/keystores/{{ inventory_hostname }}.pem" src: "{{ opendev_ca_root }}/keystores/{{ opendev_ca_server }}.pem"
dest: "{{ opendev_ca_cert_dir }}/keys/keystore.pem" dest: "{{ opendev_ca_cert_dir }}/keys/keystore.pem"