diff options
| author | Swapnil Kulkarni (coolsvap) <me@coolsvap.net> | 2015-11-23 08:51:39 +0530 |
|---|---|---|
| committer | Swapnil Kulkarni (coolsvap) <me@coolsvap.net> | 2015-11-23 22:45:27 +0530 |
| commit | d3efbd07dc4d6095089666011dc79ac3bcae8036 (patch) | |
| tree | fb34e6bde3a44469696a4adfb4bb852d2cf110f4 /docker/ceilometer | |
| parent | d14666a51d9fa0fc14d87e46c565c2afaee4d81e (diff) | |
| download | kolla-d3efbd07dc4d6095089666011dc79ac3bcae8036.tar.gz kolla-d3efbd07dc4d6095089666011dc79ac3bcae8036.zip | |
Drop root for ceilometer
Updates to ensure commands run in the ceilometer containers
are done as the 'ceilometer' user rather than root.
Change-Id: Ic94b876a002d4413f2038c29ffdb275c68323065
Partially-Implements: blueprint drop-root
Diffstat (limited to 'docker/ceilometer')
8 files changed, 15 insertions, 1 deletions
diff --git a/docker/ceilometer/ceilometer-alarm/Dockerfile.j2 b/docker/ceilometer/ceilometer-alarm/Dockerfile.j2 index d708616b6..83b032926 100644 --- a/docker/ceilometer/ceilometer-alarm/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-alarm/Dockerfile.j2 @@ -11,3 +11,5 @@ RUN yum install -y openstack-ceilometer-alarm \ {% endif %} {{ include_footer }} + +USER ceilometer diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2 index 40c6dc788..fabc4ffa6 100644 --- a/docker/ceilometer/ceilometer-api/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-api/Dockerfile.j2 @@ -14,3 +14,5 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start {{ include_footer }} + +USER ceilometer diff --git a/docker/ceilometer/ceilometer-api/extend_start.sh b/docker/ceilometer/ceilometer-api/extend_start.sh index 5e38e555d..108ef33ec 100644 --- a/docker/ceilometer/ceilometer-api/extend_start.sh +++ b/docker/ceilometer/ceilometer-api/extend_start.sh @@ -3,6 +3,6 @@ # 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-manage db_sync + ceilometer-manage db_sync exit 0 fi diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index 3c8929a0a..964abad97 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2 @@ -21,3 +21,5 @@ RUN ln -s ceilometer-base-source/* ceilometer \ && chown -R ceilometer: /etc/ceilometer /var/log/ceilometer /home/ceilometer {% endif %} + +RUN usermod -a -G kolla ceilometer diff --git a/docker/ceilometer/ceilometer-central/Dockerfile.j2 b/docker/ceilometer/ceilometer-central/Dockerfile.j2 index 1ab75cabf..a7598c742 100644 --- a/docker/ceilometer/ceilometer-central/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-central/Dockerfile.j2 @@ -11,3 +11,5 @@ RUN yum install -y openstack-ceilometer-central \ {% endif %} {{ include_footer }} + +USER ceilometer diff --git a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 b/docker/ceilometer/ceilometer-collector/Dockerfile.j2 index e8d706da0..ee28fa250 100644 --- a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-collector/Dockerfile.j2 @@ -11,3 +11,5 @@ RUN yum install -y openstack-ceilometer-collector \ {% endif %} {{ include_footer }} + +USER ceilometer diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 index 078817f9d..f77d93d9d 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 @@ -14,3 +14,5 @@ RUN yum install -y \ {% endif %} {{ include_footer }} + +USER ceilometer diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 index b3eb95d2e..d00d5a543 100644 --- a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 @@ -11,3 +11,5 @@ RUN yum install -y openstack-ceilometer-notification \ {% endif %} {{ include_footer }} + +USER ceilometer |