diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-14 05:38:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-14 05:38:13 +0000 |
| commit | 0b0e301eec113f1e007578cb44ffa6e31718758b (patch) | |
| tree | 5d4a52ad446b0ce73f5fb19342c73a5819aad940 /docker | |
| parent | 50b955c66c063785a18c02995a1b5891caab52d5 (diff) | |
| parent | 0c71f2d8ea9fbb661b09c0a35c7b135596e9635c (diff) | |
| download | kolla-0b0e301eec113f1e007578cb44ffa6e31718758b.tar.gz kolla-0b0e301eec113f1e007578cb44ffa6e31718758b.zip | |
Merge "Fix missing ceilometer user in the sudoers list for binary type"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ceilometer/ceilometer-base/Dockerfile.j2 | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index b637e4125..2d6825497 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2 @@ -29,14 +29,13 @@ RUN ln -s ceilometer-base-source/* ceilometer \ && chown -R ceilometer: /etc/ceilometer /var/log/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 %} + COPY ceilometer_sudoers /etc/sudoers.d/ceilometer_sudoers COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 750 /etc/sudoers.d \ +RUN usermod -a -G kolla ceilometer \ + && chmod 750 /etc/sudoers.d \ && chmod 440 /etc/sudoers.d/ceilometer_sudoers \ && touch /usr/local/bin/kolla_ceilometer_extend_start \ && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_ceilometer_extend_start - -{% endif %} - -RUN usermod -a -G kolla ceilometer |