diff options
| author | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2016-09-19 02:44:27 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-09-25 14:01:43 +0000 |
| commit | 7555054e7274f167f53591e15d19e85ef2dec34c (patch) | |
| tree | e43c6da27d9f61c95fa5a739cb5f1cc5c13f4986 /docker/ceilometer/ceilometer-base | |
| parent | 898d438051cfc8124667f3f7954fe3f25b89b414 (diff) | |
| download | kolla-7555054e7274f167f53591e15d19e85ef2dec34c.tar.gz kolla-7555054e7274f167f53591e15d19e85ef2dec34c.zip | |
Fix the failure of ceilometer-api container
* ceilometer-api script is removed and run ceilometer-api by using apache
* fix connection url in ceilometer.conf
Closes-Bug: #1624905
Change-Id: Iffb00ca418bab6521d61b16de4f5760aa1ae1ac7
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 |