diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-06-25 22:07:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-06-25 22:07:59 +0000 |
| commit | 92f6f1f3446dcc134b3f943cac688f27b31f2ad8 (patch) | |
| tree | 8b9c3a6743294dcfb9ba97678954dba1a2cf89b8 /docker | |
| parent | a8977713ee96fbe238f74935897c0461564595cb (diff) | |
| parent | 0e6854d22416a1178092527a15f079a115605144 (diff) | |
| download | kolla-92f6f1f3446dcc134b3f943cac688f27b31f2ad8.tar.gz kolla-92f6f1f3446dcc134b3f943cac688f27b31f2ad8.zip | |
Merge "Do not run all vars through check_required_vars"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/centos/binary/rabbitmq/config-rabbit.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/docker/centos/binary/rabbitmq/config-rabbit.sh b/docker/centos/binary/rabbitmq/config-rabbit.sh index f78cd0656..2be0f5b9c 100644 --- a/docker/centos/binary/rabbitmq/config-rabbit.sh +++ b/docker/centos/binary/rabbitmq/config-rabbit.sh @@ -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 |