diff options
| author | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2016-09-29 01:14:55 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-10-09 03:04:07 +0000 |
| commit | 18fa72c901434c023ab68754a2e68d726484f608 (patch) | |
| tree | 4a81a668b0ed43d6f94c320ca9266ecec2b62fa6 /docker | |
| parent | 7fa1a08fd2055eec5766e4539fe9237604959490 (diff) | |
| download | kolla-18fa72c901434c023ab68754a2e68d726484f608.tar.gz kolla-18fa72c901434c023ab68754a2e68d726484f608.zip | |
integrate gnocchi with ceilometer
Closes-Bug: #1626364
Change-Id: I9d586b950b7099a9b160f7b32c9ff00b189a0287
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ceilometer/ceilometer-api/extend_start.sh | 11 | ||||
| -rw-r--r-- | docker/ceilometer/ceilometer-base/Dockerfile.j2 | 6 |
2 files changed, 13 insertions, 4 deletions
diff --git a/docker/ceilometer/ceilometer-api/extend_start.sh b/docker/ceilometer/ceilometer-api/extend_start.sh index 7918a8605..1780742d0 100644 --- a/docker/ceilometer/ceilometer-api/extend_start.sh +++ b/docker/ceilometer/ceilometer-api/extend_start.sh @@ -3,7 +3,16 @@ # 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 - sudo -H -u ceilometer ceilometer-upgrade --skip-gnocchi-resource-types + if [[ "${CEILOMETER_DATABASE_TYPE}" == "mysql" ]]; then + sudo -H -u ceilometer ceilometer-upgrade --skip-gnocchi-resource-types + elif [[ "${CEILOMETER_DATABASE_TYPE}" == "gnocchi" ]]; then + sudo -H -u ceilometer ceilometer-upgrade --skip-metering-database --skip-event-database + elif [[ "${CEILOMETER_DATABASE_TYPE}" == "mongodb" ]]; then + echo "Ceilometer doesn't need to initialize a database when MongoDB is configured as the database backend." + else + echo "Unsupported database type: ${CEILOMETER_DATABASE_TYPE}" + exit 1 + fi sudo chown -R ceilometer: /var/lib/ceilometer/ exit 0 fi diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index bc39a8fcf..861ea018d 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2 @@ -26,10 +26,10 @@ MAINTAINER {{ maintainer }} ADD ceilometer-base-archive /ceilometer-base-source RUN ln -s ceilometer-base-source/* ceilometer \ && useradd --user-group ceilometer \ - && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /ceilometer pymongo \ - && mkdir -p /etc/ceilometer /var/log/ceilometer /home/ceilometer \ + && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /ceilometer[gnocchi,mongo,mysql] \ + && mkdir -p /etc/ceilometer /var/lib/ceilometer /home/ceilometer \ && cp -r /ceilometer/etc/ceilometer/* /etc/ceilometer/ \ - && chown -R ceilometer: /etc/ceilometer /var/log/ceilometer /home/ceilometer \ + && chown -R ceilometer: /etc/ceilometer /var/lib/ceilometer /home/ceilometer \ && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/ceilometer/rootwrap.conf {% endif %} |