diff options
| author | Éric Lemoine <elemoine@mirantis.com> | 2016-02-05 15:38:55 +0100 |
|---|---|---|
| committer | SamYaple <sam@yaple.net> | 2016-02-19 21:49:21 +0000 |
| commit | 5de471f61edf7da39110633a78b0bedfa95836bf (patch) | |
| tree | 7800077f0930152fd6243f9605277d0003bec072 /docker/glance | |
| parent | 4445c819917d2ae9ebe6ad250b17cac6dfbb1b56 (diff) | |
| download | kolla-5de471f61edf7da39110633a78b0bedfa95836bf.tar.gz kolla-5de471f61edf7da39110633a78b0bedfa95836bf.zip | |
Make Heka collect Glance logs
Partially implements: blueprint heka
Change-Id: I9e5ba649bc45356822138ad223430f4b93722448
Diffstat (limited to 'docker/glance')
| -rw-r--r-- | docker/glance/glance-api/extend_start.sh | 7 | ||||
| -rw-r--r-- | docker/glance/glance-base/Dockerfile.j2 | 8 | ||||
| -rw-r--r-- | docker/glance/glance-base/extend_start.sh | 8 |
3 files changed, 20 insertions, 3 deletions
diff --git a/docker/glance/glance-api/extend_start.sh b/docker/glance/glance-api/extend_start.sh index 4b99201c9..aa0372fdc 100644 --- a/docker/glance/glance-api/extend_start.sh +++ b/docker/glance/glance-api/extend_start.sh @@ -1,5 +1,12 @@ #!/bin/bash +if [[ ! -d "/var/log/kolla/glance" ]]; then + mkdir -p /var/log/kolla/glance +fi +if [[ $(stat -c %a /var/log/kolla/glance) != "755" ]]; then + chmod 755 /var/log/kolla/glance +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/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2 index 7a53efa76..74edfc72d 100644 --- a/docker/glance/glance-base/Dockerfile.j2 +++ b/docker/glance/glance-base/Dockerfile.j2 @@ -44,14 +44,16 @@ ADD glance-base-archive /glance-base-source RUN ln -s glance-base-source/* glance \ && useradd --user-group glance \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /glance \ - && mkdir -p /etc/glance /var/log/glance /var/lib/glance /home/glance \ + && mkdir -p /etc/glance /var/lib/glance /home/glance \ && cp -r /glance/etc/* /etc/glance/ \ - && chown -R glance: /etc/glance /var/log/glance /var/lib/glance /home/glance + && chown -R glance: /etc/glance /var/lib/glance /home/glance {% endif %} COPY glance_sudoers /etc/sudoers.d/glance_sudoers +COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN usermod -a -G kolla glance \ && chmod 750 /etc/sudoers.d \ - && chmod 440 /etc/sudoers.d/glance_sudoers + && chmod 440 /etc/sudoers.d/glance_sudoers \ + && chmod 755 /usr/local/bin/kolla_extend_start diff --git a/docker/glance/glance-base/extend_start.sh b/docker/glance/glance-base/extend_start.sh new file mode 100644 index 000000000..467a2e188 --- /dev/null +++ b/docker/glance/glance-base/extend_start.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +if [[ ! -d "/var/log/kolla/glance" ]]; then + mkdir -p /var/log/kolla/glance +fi +if [[ $(stat -c %a /var/log/kolla/glance) != "755" ]]; then + chmod 755 /var/log/kolla/glance +fi |