Merge "Ensure post-save certmonger scripts target the right HA container"
This commit is contained in:
commit
b99758d160
@ -33,7 +33,7 @@ fi
|
||||
|
||||
cat "$service_certificate" "$ca_path" "$service_key" > "$service_pem"
|
||||
|
||||
haproxy_container_name=$($container_cli ps --format="{{.Names}}" | grep haproxy)
|
||||
haproxy_container_name=$($container_cli ps --format="{{.Names}}" | grep -w -E 'haproxy(-bundle-.*-[0-9]+)?')
|
||||
|
||||
if [ "$ACTION" == "reload" ]; then
|
||||
# Refresh the cert at the mount-point
|
||||
|
@ -3,7 +3,7 @@
|
||||
|
||||
container_cli=$(hiera -c /etc/puppet/hiera.yaml container_cli podman)
|
||||
|
||||
container_name=$($container_cli ps --format="{{.Names}}" | grep rabbitmq)
|
||||
container_name=$($container_cli ps --format="{{.Names}}" | grep -w -E 'rabbitmq(-bundle-.*-[0-9]+)?')
|
||||
|
||||
service_pem="$(hiera -c /etc/puppet/hiera.yaml tripleo::rabbitmq::service_certificate)"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user