openstack/openstack-helm-infra
Code Issues Proposed changes

Handle root vHost declaration

Browse Source 
If the source chart does not declare a vHost value, or uses the value of
"/", the script would fail upon trying to declare the vhost. This change
avoids the declaration of the "/" vhost, and continues with setting the
specified user with permissions to "/"

Change-Id: I28619c0aef22049c632c92a2f9a9d3831f8c284c
This commit is contained in:
Bryan Strassner 2019-01-16 13:34:40 -06:00
parent 00b40480a3
commit 34b2a965cb
1 changed files with 11 additions and 4 deletions

15
helm-toolkit/templates/scripts/_rabbit-init.sh.tpl

@ -45,6 +45,8 @@ RABBITMQ_PASSWORD=$(echo "${RABBITMQ_USER_CONNECTION}" | \
RABBITMQ_VHOST=$(echo "${RABBITMQ_USER_CONNECTION}" | \ RABBITMQ_VHOST=$(echo "${RABBITMQ_USER_CONNECTION}" | \
awk -F'[@]' '{print $2}' | \ awk -F'[@]' '{print $2}' | \
awk -F'[:/]' '{print $3}') awk -F'[:/]' '{print $3}')
# Resolve vHost to / if no value is set
RABBITMQ_VHOST="${RABBITMQ_VHOST:-/}"
function rabbitmqadmin_cli () { function rabbitmqadmin_cli () {
rabbitmqadmin \ rabbitmqadmin \
@ -62,10 +64,15 @@ rabbitmqadmin_cli \
password="${RABBITMQ_PASSWORD}" \ password="${RABBITMQ_PASSWORD}" \
tags="user" tags="user"
echo "Managing: vHost: ${RABBITMQ_VHOST}" if [ "${RABBITMQ_VHOST}" != "/" ]
rabbitmqadmin_cli \ then
declare vhost \ echo "Managing: vHost: ${RABBITMQ_VHOST}"
name="${RABBITMQ_VHOST}" rabbitmqadmin_cli \
declare vhost \
name="${RABBITMQ_VHOST}"
else
echo "Skipping root vHost declaration: vHost: ${RABBITMQ_VHOST}"
fi
echo "Managing: Permissions: ${RABBITMQ_USERNAME} on ${RABBITMQ_VHOST}" echo "Managing: Permissions: ${RABBITMQ_USERNAME} on ${RABBITMQ_VHOST}"
rabbitmqadmin_cli \ rabbitmqadmin_cli \