Skip to content
This repository has been archived by the owner on Feb 29, 2024. It is now read-only.

Commit

Permalink
Restore missing SAN IP in etcd cert
Browse files Browse the repository at this point in the history
This patch fixes a regression in the etcd cert that is used with
tls-everywhere. The etcd service makes cluster connections using
its IP address, so with tls-e the etcd cert needs to include its
address as a SAN IP. The SAN IP was inadvertently dropped when
cert generation was moved from puppet to an ansible role.

Resolves: rhbz#2096230
Change-Id: I28e268c58bf63aaa81a67f48ca492fe97d9a07e9
  • Loading branch information
ASBishop committed Jun 13, 2022
1 parent 1a12459 commit 9ed1c7b
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions deployment/etcd/etcd-container-puppet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,12 @@ outputs:
template: "{{cloud_names.cloud_name_NETWORK}}"
params:
NETWORK: {get_param: [ServiceNetMap, EtcdNetwork]}
# etcd3 expects to use IP addresses, so add a SAN IP to its cert
ip:
str_replace:
template: "{{NETWORK_ip}}"
params:
NETWORK: {get_param: [ServiceNetMap, EtcdNetwork]}
principal:
str_replace:
template: "etcd/{{fqdn_$NETWORK}}@{{idm_realm}}"
Expand Down

0 comments on commit 9ed1c7b

Please sign in to comment.