diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-12 03:34:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-12 03:34:22 +0000 |
| commit | 9fe11b46fd41c9f3cc3c0216bf8ac9b0267ddf70 (patch) | |
| tree | ab25b132eaa80a3ec24a87a58ed95a1d09564ef3 /docker/common | |
| parent | 5bfe20f0943da3cfb0d1b1a5b3e9d534726f2926 (diff) | |
| parent | 802b118bfaa730c85681b33767a00e448dc26f6d (diff) | |
| download | kolla-9fe11b46fd41c9f3cc3c0216bf8ac9b0267ddf70.tar.gz kolla-9fe11b46fd41c9f3cc3c0216bf8ac9b0267ddf70.zip | |
Merge "Add RabbitMQ image for Ubuntu"
Diffstat (limited to 'docker/common')
| -rw-r--r-- | docker/common/rabbitmq/config-rabbit.sh | 3 |
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" |