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-api/extend_start.sh | |
| 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-api/extend_start.sh')
| -rw-r--r-- | docker/ceilometer/ceilometer-api/extend_start.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/docker/ceilometer/ceilometer-api/extend_start.sh b/docker/ceilometer/ceilometer-api/extend_start.sh index 0a8cb6b6f..7918a8605 100644 --- a/docker/ceilometer/ceilometer-api/extend_start.sh +++ b/docker/ceilometer/ceilometer-api/extend_start.sh @@ -3,7 +3,15 @@ # 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 - ceilometer-dbsync + sudo -H -u ceilometer ceilometer-upgrade --skip-gnocchi-resource-types sudo chown -R ceilometer: /var/lib/ceilometer/ exit 0 fi + +if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then + # Loading Apache2 ENV variables + . /etc/apache2/envvars + rm -rf /var/run/apache2/* +else + rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd* +fi |