From 7555054e7274f167f53591e15d19e85ef2dec34c Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Mon, 19 Sep 2016 02:44:27 +0800 Subject: 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 --- docker/ceilometer/ceilometer-base/extend_start.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'docker/ceilometer/ceilometer-base') 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 -- cgit v1.2.3