diff --git a/files/certmonger-rabbitmq-refresh.sh b/files/certmonger-rabbitmq-refresh.sh index 810e0e683..1440a9a5f 100644 --- a/files/certmonger-rabbitmq-refresh.sh +++ b/files/certmonger-rabbitmq-refresh.sh @@ -5,8 +5,8 @@ container_cli=$(hiera -c /etc/puppet/hiera.yaml container_cli podman) container_name=$($container_cli ps --format="{{.Names}}" | grep -w -E 'rabbitmq(-bundle-.*-[0-9]+)?') -service_crt="$(hiera -c /etc/puppet/hiera.yaml tripleo::rabbitmq::service_certificate.service_certificate)" -service_key="$(hiera -c /etc/puppet/hiera.yaml tripleo::rabbitmq::service_certificate.service_key)" +service_crt="$(hiera -c /etc/puppet/hiera.yaml tripleo::profile::base::rabbitmq::certificate_specs.service_certificate)" +service_key="$(hiera -c /etc/puppet/hiera.yaml tripleo::profile::base::rabbitmq::certificate_specs.service_key)" if echo "$container_name" | grep -q "^rabbitmq-bundle"; then # lp#1917868: Do not use podman cp with HA containers as they get @@ -25,9 +25,6 @@ else $container_cli exec -u root "$container_name" cp "/var/lib/kolla/config_files/src-tls$service_key" "$service_key" fi -# Copy the new cert from the mount-point to the real path -$container_cli exec "$container_name" cp "/var/lib/kolla/config_files/src-tls$service_pem" "$service_pem" - # Set appropriate permissions $container_cli exec -u root "$container_name" chown rabbitmq:rabbitmq "$service_crt" $container_cli exec -u root "$container_name" chown rabbitmq:rabbitmq "$service_key"