aboutsummaryrefslogtreecommitdiff
path: root/docker/common/rabbitmq
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-30 18:54:43 +0000
committerGerrit Code Review <review@openstack.org>2015-07-30 18:54:43 +0000
commit731d5205cbed74028bda0883a5432afc476605b6 (patch)
tree38a04d3f8f1d817fc08931d23df29fff416c82ab /docker/common/rabbitmq
parent15eb390ab307885943280a4b5d1287dc580517aa (diff)
parent1c147e4def0605e64a41916b71a9f2e675a0cbcf (diff)
downloadkolla-731d5205cbed74028bda0883a5432afc476605b6.tar.gz
kolla-731d5205cbed74028bda0883a5432afc476605b6.zip
Merge "Update service helper scripts for variable changes"
Diffstat (limited to 'docker/common/rabbitmq')
-rwxr-xr-xdocker/common/rabbitmq/config-internal.sh3
-rw-r--r--docker/common/rabbitmq/config-rabbit.sh3
2 files changed, 4 insertions, 2 deletions
diff --git a/docker/common/rabbitmq/config-internal.sh b/docker/common/rabbitmq/config-internal.sh
index 8fc77f421..b34a4fa59 100755
--- a/docker/common/rabbitmq/config-internal.sh
+++ b/docker/common/rabbitmq/config-internal.sh
@@ -3,7 +3,8 @@
. /opt/kolla/kolla-common.sh
. /opt/kolla/config-rabbit.sh
-check_required_vars RABBITMQ_PASS RABBITMQ_USER
+check_required_vars RABBITMQ_PASS \
+ RABBITMQ_USER
configure_rabbit
diff --git a/docker/common/rabbitmq/config-rabbit.sh b/docker/common/rabbitmq/config-rabbit.sh
index 29cd1bb06..f14d796ad 100644
--- a/docker/common/rabbitmq/config-rabbit.sh
+++ b/docker/common/rabbitmq/config-rabbit.sh
@@ -21,7 +21,8 @@ function set_rabbitmq_cookie {
}
function configure_cluster {
- check_required_vars RABBITMQ_CLUSTER_COOKIE RABBITMQ_CLUSTER_NODES
+ check_required_vars RABBITMQ_CLUSTER_COOKIE \
+ RABBITMQ_CLUSTER_NODES
set_rabbitmq_cookie
HOSTNAME=""