openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Ensure post-save certmonger scripts target the right HA container"

This commit is contained in:
Zuul 2020-07-21 02:01:56 +00:00 committed by Gerrit Code Review
parent d795c45204 3e942b7ff5
commit b99758d160
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/certmonger-haproxy-refresh.sh
View File

@ -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

2
files/certmonger-rabbitmq-refresh.sh
View File

@ -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)"