diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-26 13:35:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-26 13:35:03 +0000 |
| commit | 7140bead4bfbff411b6b62eeebb77650a6479916 (patch) | |
| tree | 7f97f2bc885a515ab6b2927e43bdd9308da1ea95 /docker/ceilometer/ceilometer-base | |
| parent | a9190021ab646c85acbc707c879f7aa3aa8f30cc (diff) | |
| parent | 7555054e7274f167f53591e15d19e85ef2dec34c (diff) | |
| download | kolla-7140bead4bfbff411b6b62eeebb77650a6479916.tar.gz kolla-7140bead4bfbff411b6b62eeebb77650a6479916.zip | |
Merge "Fix the failure of ceilometer-api container"
Diffstat (limited to 'docker/ceilometer/ceilometer-base')
| -rw-r--r-- | docker/ceilometer/ceilometer-base/extend_start.sh | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/docker/ceilometer/ceilometer-base/extend_start.sh b/docker/ceilometer/ceilometer-base/extend_start.sh index b6027cf6d..4d3fe6b61 100644 --- a/docker/ceilometer/ceilometer-base/extend_start.sh +++ b/docker/ceilometer/ceilometer-base/extend_start.sh @@ -1,10 +1,15 @@ #!/bin/bash -if [[ ! -d "/var/log/kolla/ceilometer" ]]; then - mkdir -p /var/log/kolla/ceilometer +CEILOMETER_LOG_DIR=/var/log/kolla/ceilometer + +if [[ ! -d "${CEILOMETER_LOG_DIR}" ]]; then + mkdir -p "${CEILOMETER_LOG_DIR}" +fi +if [[ $(stat -c %U:%G "${CEILOMETER_LOG_DIR}") != "ceilometer:kolla" ]]; then + chown ceilometer:kolla "${CEILOMETER_LOG_DIR}" fi -if [[ $(stat -c %a /var/log/kolla/ceilometer) != "755" ]]; then - chmod 755 /var/log/kolla/ceilometer +if [[ $(stat -c %a "${CEILOMETER_LOG_DIR}") != "755" ]]; then + chmod 755 "${CEILOMETER_LOG_DIR}" fi . /usr/local/bin/kolla_ceilometer_extend_start |