diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-20 22:24:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-20 22:24:30 +0000 |
| commit | 66ac6ede9793b68acefd20608e9468620f97d026 (patch) | |
| tree | 1bbce150d95d456a358caf5678da2ea2326be2f1 /docker | |
| parent | e69780da4372efd7e7fcab96ffeb0ea382c12c0d (diff) | |
| parent | 1e863081404a4e133a00d17428dc196e475f241e (diff) | |
| download | kolla-66ac6ede9793b68acefd20608e9468620f97d026.tar.gz kolla-66ac6ede9793b68acefd20608e9468620f97d026.zip | |
Merge "Make Heka collect Murano logs"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/murano/murano-api/extend_start.sh | 7 | ||||
| -rw-r--r-- | docker/murano/murano-base/Dockerfile.j2 | 9 | ||||
| -rw-r--r-- | docker/murano/murano-base/extend_start.sh | 8 |
3 files changed, 21 insertions, 3 deletions
diff --git a/docker/murano/murano-api/extend_start.sh b/docker/murano/murano-api/extend_start.sh index d46b2b0af..a00a46503 100644 --- a/docker/murano/murano-api/extend_start.sh +++ b/docker/murano/murano-api/extend_start.sh @@ -1,5 +1,12 @@ #!/bin/bash +if [[ ! -d "/var/log/kolla/murano" ]]; then + mkdir -p /var/log/kolla/murano +fi +if [[ $(stat -c %a /var/log/kolla/murano) != "755" ]]; then + chmod 755 /var/log/kolla/murano +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/murano/murano-base/Dockerfile.j2 b/docker/murano/murano-base/Dockerfile.j2 index ee1337357..49e372581 100644 --- a/docker/murano/murano-base/Dockerfile.j2 +++ b/docker/murano/murano-base/Dockerfile.j2 @@ -20,10 +20,13 @@ ADD murano-base-archive /murano-base-source RUN ln -s murano-base-source/* murano \ && useradd --user-group murano \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /murano \ - && mkdir -p /etc/murano /var/log/murano /home/murano \ + && mkdir -p /etc/murano /home/murano \ && cp -r /murano/etc/murano/* /etc/murano/ \ - && chown -R murano: /etc/murano /var/log/murano /home/murano + && chown -R murano: /etc/murano /home/murano {% endif %} -RUN usermod -a -G kolla murano +COPY extend_start.sh /usr/local/bin/kolla_extend_start + +RUN usermod -a -G kolla murano \ + && chmod 755 /usr/local/bin/kolla_extend_start diff --git a/docker/murano/murano-base/extend_start.sh b/docker/murano/murano-base/extend_start.sh new file mode 100644 index 000000000..1f94551d7 --- /dev/null +++ b/docker/murano/murano-base/extend_start.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +if [[ ! -d "/var/log/kolla/murano" ]]; then + mkdir -p /var/log/kolla/murano +fi +if [[ $(stat -c %a /var/log/kolla/murano) != "755" ]]; then + chmod 755 /var/log/kolla/murano +fi |