diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-03 22:42:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-03 22:42:31 +0000 |
| commit | 67864c318b497c4bed71b89cfabcc6afe4e7385c (patch) | |
| tree | 37bc7f0bb755e6d42f2494bec4ed2087b5a307df /docker | |
| parent | d3b6752a65f00586be3fdb1c948703f2125bb7b2 (diff) | |
| parent | 285e42a99c74848d12eaf9e81e86a6431fab3cac (diff) | |
| download | kolla-67864c318b497c4bed71b89cfabcc6afe4e7385c.tar.gz kolla-67864c318b497c4bed71b89cfabcc6afe4e7385c.zip | |
Merge "Make Heka collect Manila logs"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/manila/manila-api/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/manila/manila-base/Dockerfile.j2 | 9 | ||||
| -rw-r--r-- | docker/manila/manila-base/extend_start.sh | 10 |
3 files changed, 19 insertions, 4 deletions
diff --git a/docker/manila/manila-api/Dockerfile.j2 b/docker/manila/manila-api/Dockerfile.j2 index ac2fe479d..3590103a9 100644 --- a/docker/manila/manila-api/Dockerfile.j2 +++ b/docker/manila/manila-api/Dockerfile.j2 @@ -1,8 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }} MAINTAINER {{ maintainer }} -COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start +COPY extend_start.sh /usr/local/bin/kolla_manila_extend_start +RUN chmod 755 /usr/local/bin/kolla_manila_extend_start {{ include_footer }} diff --git a/docker/manila/manila-base/Dockerfile.j2 b/docker/manila/manila-base/Dockerfile.j2 index b4ea531b9..ef6c2e833 100644 --- a/docker/manila/manila-base/Dockerfile.j2 +++ b/docker/manila/manila-base/Dockerfile.j2 @@ -14,9 +14,9 @@ ADD manila-base-archive /manila-base-source RUN ln -s manila-base-source/* manila \ && useradd --user-group manila \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /manila \ - && mkdir -p /etc/manila /var/lib/manila /var/cache/manila /var/log/manila /home/manila \ + && mkdir -p /etc/manila /var/lib/manila /var/cache/manila /home/manila \ && cp -r /manila/etc/manila/* /etc/manila/ \ - && chown -R manila: /etc/manila /var/lib/manila /var/cache/manila /var/log/manila /home/manila \ + && chown -R manila: /etc/manila /var/lib/manila /var/cache/manila /home/manila \ && 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/manila/rootwrap.conf COPY manila_sudoers /etc/sudoers.d/manila_sudoers @@ -25,4 +25,9 @@ RUN chmod 750 /etc/sudoers.d \ {% endif %} +COPY extend_start.sh /usr/local/bin/kolla_extend_start + +RUN touch /usr/local/bin/kolla_manila_extend_start \ + && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_manila_extend_start + RUN usermod -a -G kolla manila diff --git a/docker/manila/manila-base/extend_start.sh b/docker/manila/manila-base/extend_start.sh new file mode 100644 index 000000000..84bcd2ebe --- /dev/null +++ b/docker/manila/manila-base/extend_start.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +if [[ ! -d "/var/log/kolla/manila" ]]; then + mkdir -p /var/log/kolla/manila +fi +if [[ $(stat -c %a /var/log/kolla/manila) != "755" ]]; then + chmod 755 /var/log/kolla/manila +fi + +source /usr/local/bin/kolla_manila_extend_start |