diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-05 07:03:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-05 07:03:02 +0000 |
| commit | 4b143f09e14783376c0b07eb43dfc790c01c6c29 (patch) | |
| tree | 3663a8684a7e6294b1f0061b80f31ef7e5b95d96 | |
| parent | c9cbadcf400fb3b3e404acdaa4465c1400a9ea43 (diff) | |
| parent | 1a79fb6032f5a6638b97772124ffaf233fd6e44c (diff) | |
| download | kolla-4b143f09e14783376c0b07eb43dfc790c01c6c29.tar.gz kolla-4b143f09e14783376c0b07eb43dfc790c01c6c29.zip | |
Merge "Create /var/log/kolla/rally before running rally-manage db create/upgrade"
| -rw-r--r-- | docker/rally/extend_start.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/docker/rally/extend_start.sh b/docker/rally/extend_start.sh index 06d4d6086..e490d8b88 100644 --- a/docker/rally/extend_start.sh +++ b/docker/rally/extend_start.sh @@ -1,15 +1,15 @@ #!/bin/bash -# 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 - rally-manage db create || rally-manage db upgrade - exit 0 -fi - if [[ ! -d "/var/log/kolla/rally" ]]; then mkdir -p /var/log/kolla/rally fi if [[ $(stat -c %a /var/log/kolla/rally) != "755" ]]; then chmod 755 /var/log/kolla/rally fi + +# 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 + rally-manage db create || rally-manage db upgrade + exit 0 +fi |