diff options
| author | Hui Kang <kangh@us.ibm.com> | 2016-04-17 14:18:07 -0400 |
|---|---|---|
| committer | Hui Kang <kangh@us.ibm.com> | 2016-04-17 14:18:07 -0400 |
| commit | a7034692651195aa2ece5f8b560fc8d98d8db660 (patch) | |
| tree | 73de3c33285a074def8639a6ed8808291c475272 /docker/ceilometer/ceilometer-base | |
| parent | 0786e6b1659ad2eccc36158ea49545e2113d9945 (diff) | |
| download | kolla-a7034692651195aa2ece5f8b560fc8d98d8db660.tar.gz kolla-a7034692651195aa2ece5f8b560fc8d98d8db660.zip | |
Add missing extend_start files for ceilometer container
Change-Id: I927c0593fc6b669d760b3744a5e77c532a164ca5
closes-Bug: #1571274
Partially-Implements: blueprint ansible-ceilometer
Diffstat (limited to 'docker/ceilometer/ceilometer-base')
| -rw-r--r-- | docker/ceilometer/ceilometer-base/Dockerfile.j2 | 8 | ||||
| -rw-r--r-- | docker/ceilometer/ceilometer-base/ceilometer_sudoers | 1 | ||||
| -rw-r--r-- | docker/ceilometer/ceilometer-base/extend_start.sh | 10 |
3 files changed, 19 insertions, 0 deletions
diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index c5b319aee..90ce0b334 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2 @@ -29,6 +29,14 @@ 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 +COPY ceilometer_sudoers /etc/sudoers.d/ceilometer_sudoers +COPY extend_start.sh /usr/local/bin/kolla_extend_start + +RUN 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 diff --git a/docker/ceilometer/ceilometer-base/ceilometer_sudoers b/docker/ceilometer/ceilometer-base/ceilometer_sudoers new file mode 100644 index 000000000..dd861bb58 --- /dev/null +++ b/docker/ceilometer/ceilometer-base/ceilometer_sudoers @@ -0,0 +1 @@ +%kolla ALL=(root) NOPASSWD: /usr/bin/chown -R ceilometer\: /var/lib/ceilometer/, /bin/chown -R ceilometer\: /var/lib/ceilometer/ diff --git a/docker/ceilometer/ceilometer-base/extend_start.sh b/docker/ceilometer/ceilometer-base/extend_start.sh new file mode 100644 index 000000000..19521d9de --- /dev/null +++ b/docker/ceilometer/ceilometer-base/extend_start.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +if [[ ! -d "/var/log/kolla/ceilometer" ]]; then + mkdir -p /var/log/kolla/ceilometer +fi +if [[ $(stat -c %a /var/log/kolla/ceilometer) != "755" ]]; then + chmod 755 /var/log/kolla/ceilometer +fi + +source /usr/local/bin/kolla_ceilometer_extend_start |