openstack/kolla-ansible
Code Issues Proposed changes

Merge "Do not run all vars through check_required_vars"

Browse Source
This commit is contained in:
Jenkins 2015-06-25 22:07:59 +00:00 committed by Gerrit Code Review
commit 92f6f1f344
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker/centos/binary/rabbitmq/config-rabbit.sh
View File

@ -2,8 +2,7 @@
. /opt/kolla/kolla-common.sh
check_required_vars RABBITMQ_CLUSTER_COOKIE RABBITMQ_CLUSTER_NODES \
RABBITMQ_LOG_BASE RABBITMQ_PASS RABBITMQ_USER
check_required_vars RABBITMQ_PASS RABBITMQ_USER
RABBITMQ_CLUSTER_CONFIGURATION=""
@ -12,7 +11,7 @@ function configure_files {
sed -i '
s|@RABBITMQ_USER@|'"$RABBITMQ_USER"'|g
s|@RABBITMQ_PASS@|'"$RABBITMQ_PASS"'|g
s|@RABBITMQ_CLUSTER_NODES@|'"$RABBITMQ_CLUSTER_CONFIGURATION"'|g
s|@RABBITMQ_CLUSTER_CONFIGURATION@|'"$RABBITMQ_CLUSTER_CONFIGURATION"'|g
' /etc/rabbitmq/rabbitmq.config
sed -i '
@ -21,6 +20,8 @@ function configure_files {
}
function configure_cluster {
check_required_vars RABBITMQ_CLUSTER_COOKIE RABBITMQ_CLUSTER_NODES
echo "${RABBITMQ_CLUSTER_COOKIE}" > /var/lib/rabbitmq/.erlang.cookie
chown rabbitmq /var/lib/rabbitmq/.erlang.cookie
chmod 700 /var/lib/rabbitmq/.erlang.cookie