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