aboutsummaryrefslogtreecommitdiff
path: root/docker/common
diff options
context:
space:
mode:
authorMichal Rostecki <michal.rostecki@allegrogroup.com>2015-07-09 18:07:44 +0200
committerMichal Rostecki <michal.rostecki@allegrogroup.com>2015-07-09 19:22:22 +0200
commit802b118bfaa730c85681b33767a00e448dc26f6d (patch)
treece0cb6641439fe0099c127c77ad8511ecc0d9f79 /docker/common
parentfcda6a06d8eee9d3f3199962b36a04a8c702072c (diff)
downloadkolla-802b118bfaa730c85681b33767a00e448dc26f6d.tar.gz
kolla-802b118bfaa730c85681b33767a00e448dc26f6d.zip
Add RabbitMQ image for Ubuntu
Dockerfile for RabbitMQ server installed from Ubuntu Cloud Archive. Partially implements: blueprint install-from-ubuntu Change-Id: Ie90cbc4bea943b81b966d7b391b4de6df2e68364
Diffstat (limited to 'docker/common')
-rw-r--r--docker/common/rabbitmq/config-rabbit.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/common/rabbitmq/config-rabbit.sh b/docker/common/rabbitmq/config-rabbit.sh
index 750b253a4..29cd1bb06 100644
--- a/docker/common/rabbitmq/config-rabbit.sh
+++ b/docker/common/rabbitmq/config-rabbit.sh
@@ -44,7 +44,8 @@ function configure_rabbit {
elif [ "$RABBITMQ_SERVICE_HOST" ]; then
# work around:
# https://bugs.launchpad.net/ubuntu/+source/rabbitmq-server/+bug/653405
- echo "${RABBITMQ_SERVICE_HOST} `/usr/bin/hostname -s`" > /etc/hosts
+ HOSTNAME=`/usr/bin/hostname -s 2> /dev/null || /bin/hostname 2> /dev/null`
+ echo "${RABBITMQ_SERVICE_HOST} ${HOSTNAME}" > /etc/hosts
else
echo "You need RABBITMQ_SERVICE_HOST or RABBITMQ_CLUSTER_NODES & " \
" RABBITMQ_CLUSTER_COOKIES variables"