diff options
| author | Hui Kang <kangh@us.ibm.com> | 2016-03-29 13:25:43 -0400 |
|---|---|---|
| committer | Hui Kang <kangh@us.ibm.com> | 2016-06-16 22:05:56 -0400 |
| commit | 4108c6c6ec0c0d31d9314a5d3129e4d4eff44190 (patch) | |
| tree | 573fd09efeb62d8d8054670b21145650f50448ae /docker | |
| parent | 1924db6d775ba49b8643991b1f7cad7631e6b2aa (diff) | |
| download | kolla-4108c6c6ec0c0d31d9314a5d3129e4d4eff44190.tar.gz kolla-4108c6c6ec0c0d31d9314a5d3129e4d4eff44190.zip | |
Implement ceilometer ansible role
Change-Id: I13c50a78b2dc7c98b720a4b2e7161104213bd295
Implements: bp ansible-ceilometer
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ceilometer/ceilometer-api/extend_start.sh | 2 | ||||
| -rw-r--r-- | docker/ceilometer/ceilometer-compute/Dockerfile.j2 | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/docker/ceilometer/ceilometer-api/extend_start.sh b/docker/ceilometer/ceilometer-api/extend_start.sh index b9f026127..0a8cb6b6f 100644 --- a/docker/ceilometer/ceilometer-api/extend_start.sh +++ b/docker/ceilometer/ceilometer-api/extend_start.sh @@ -3,7 +3,7 @@ # 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-manage db_sync + ceilometer-dbsync sudo chown -R ceilometer: /var/lib/ceilometer/ exit 0 fi diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 index 829d1403e..96f0ff80b 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 @@ -38,4 +38,6 @@ RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements {{ include_footer }} -USER ceilometer +# NOTE(huikang): non-root user does not work with libvirt.sock. +# Need configuration in nova-libvirt container to allow +# USER ceilometer to access libvirt.sock |