diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-18 04:05:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-18 04:05:52 +0000 |
| commit | e48f68c82a4628829b47cffb35e706ce7147cec4 (patch) | |
| tree | c1e0647ae3b120c3c23735e6720c456f6efff8b4 /docker | |
| parent | 80c4fbf1eed1f0f97bdcdd04666b056ce34e9c5a (diff) | |
| parent | 4108c6c6ec0c0d31d9314a5d3129e4d4eff44190 (diff) | |
| download | kolla-e48f68c82a4628829b47cffb35e706ce7147cec4.tar.gz kolla-e48f68c82a4628829b47cffb35e706ce7147cec4.zip | |
Merge "Implement ceilometer ansible role"
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 |