diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-20 22:24:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-20 22:24:16 +0000 |
| commit | 556a02786960e67d48bb1aaf4d1b3d83f644f841 (patch) | |
| tree | dd8edb1964314875ff27b1691040aff68b821b18 /docker | |
| parent | 0075336e5bebf36f0f160ba6a4816eb591961693 (diff) | |
| parent | 170b493d472be4c4e44f5a94a8e4a774a37e198c (diff) | |
| download | kolla-556a02786960e67d48bb1aaf4d1b3d83f644f841.tar.gz kolla-556a02786960e67d48bb1aaf4d1b3d83f644f841.zip | |
Merge "Make Heka collect Cinder logs"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/cinder/cinder-api/extend_start.sh | 7 | ||||
| -rw-r--r-- | docker/cinder/cinder-base/Dockerfile.j2 | 16 | ||||
| -rw-r--r-- | docker/cinder/cinder-base/extend_start.sh | 8 |
3 files changed, 24 insertions, 7 deletions
diff --git a/docker/cinder/cinder-api/extend_start.sh b/docker/cinder/cinder-api/extend_start.sh index 176515189..f6e2ddb20 100644 --- a/docker/cinder/cinder-api/extend_start.sh +++ b/docker/cinder/cinder-api/extend_start.sh @@ -1,6 +1,13 @@ #!/bin/bash set -o errexit +if [[ ! -d "/var/log/kolla/cinder" ]]; then + mkdir -p /var/log/kolla/cinder +fi +if [[ $(stat -c %a /var/log/kolla/cinder) != "755" ]]; then + chmod 755 /var/log/kolla/cinder +fi + # 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 diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 index 41b33922d..46e87198a 100644 --- a/docker/cinder/cinder-base/Dockerfile.j2 +++ b/docker/cinder/cinder-base/Dockerfile.j2 @@ -45,15 +45,17 @@ ADD cinder-base-archive /cinder-base-source RUN ln -s cinder-base-source/* cinder \ && useradd --user-group cinder \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /cinder \ - && mkdir -p /etc/cinder /var/log/cinder /var/lib/cinder /home/cinder \ + && mkdir -p /etc/cinder /var/lib/cinder /home/cinder \ && cp -r /cinder/etc/cinder/* /etc/cinder/ \ - && chown -R cinder: /etc/cinder /var/log/cinder /var/lib/cinder /home/cinder \ + && chown -R cinder: /etc/cinder /var/lib/cinder /home/cinder \ && 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/cinder/rootwrap.conf -COPY cinder_sudoers /etc/sudoers.d/cinder_sudoers -RUN chmod 750 /etc/sudoers.d \ - && chmod 440 /etc/sudoers.d/cinder_sudoers - {% endif %} -RUN usermod -a -G kolla cinder +COPY cinder_sudoers /etc/sudoers.d/cinder_sudoers +COPY extend_start.sh /usr/local/bin/kolla_extend_start + +RUN usermod -a -G kolla cinder \ + && chmod 750 /etc/sudoers.d \ + && chmod 440 /etc/sudoers.d/cinder_sudoers \ + && chmod 755 /usr/local/bin/kolla_extend_start diff --git a/docker/cinder/cinder-base/extend_start.sh b/docker/cinder/cinder-base/extend_start.sh new file mode 100644 index 000000000..2652bf264 --- /dev/null +++ b/docker/cinder/cinder-base/extend_start.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +if [[ ! -d "/var/log/kolla/cinder" ]]; then + mkdir -p /var/log/kolla/cinder +fi +if [[ $(stat -c %a /var/log/kolla/cinder) != "755" ]]; then + chmod 755 /var/log/kolla/cinder +fi |