diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-15 09:20:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-15 09:20:20 +0000 |
| commit | 60b8d2aa9dd4ecdde0dff7cb807e4205e727deff (patch) | |
| tree | 548ac3c0cc6e1d6dc9c5b2246b49d3fe4c42edc4 /docker | |
| parent | 8be89bc7e44354b2547697498c4ba60e93644184 (diff) | |
| parent | 329293b182ba5e72e633a66d767a888ed201058c (diff) | |
| download | kolla-60b8d2aa9dd4ecdde0dff7cb807e4205e727deff.tar.gz kolla-60b8d2aa9dd4ecdde0dff7cb807e4205e727deff.zip | |
Merge "Make rabbitmq log dir configurable"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/rabbitmq/extend_start.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/docker/rabbitmq/extend_start.sh b/docker/rabbitmq/extend_start.sh index 7aa685e82..ef28d2b5f 100644 --- a/docker/rabbitmq/extend_start.sh +++ b/docker/rabbitmq/extend_start.sh @@ -1,5 +1,7 @@ #!/bin/bash +: ${RABBITMQ_LOG_DIR:=/var/log/kolla/rabbitmq} + # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases # of the KOLLA_BOOTSTRAP variable being set, including empty. if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then @@ -15,9 +17,10 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then exit 0 fi -if [[ ! -d "/var/log/kolla/rabbitmq" ]]; then - mkdir -p /var/log/kolla/rabbitmq +if [[ ! -d "${RABBITMQ_LOG_DIR}" ]]; then + mkdir -p ${RABBITMQ_LOG_DIR} fi -if [[ $(stat -c %a /var/log/kolla/rabbitmq) != "755" ]]; then - chmod 755 /var/log/kolla/rabbitmq + +if [[ $(stat -c %a ${RABBITMQ_LOG_DIR}) != "755" ]]; then + chmod 755 ${RABBITMQ_LOG_DIR} fi |