diff options
| author | Éric Lemoine <elemoine@mirantis.com> | 2016-02-11 18:49:40 +0100 |
|---|---|---|
| committer | SamYaple <sam@yaple.net> | 2016-02-19 21:49:21 +0000 |
| commit | a2b130d6bacc58a28ed16bf42c4f325d027c2e1f (patch) | |
| tree | e3d70c6a5608f8dcc3c1e46d98371ad178c4a25b /docker | |
| parent | 684873b89b81245acff8310b208807389d44b7d6 (diff) | |
| download | kolla-a2b130d6bacc58a28ed16bf42c4f325d027c2e1f.tar.gz kolla-a2b130d6bacc58a28ed16bf42c4f325d027c2e1f.zip | |
Make Heka collect Neutron logs
Partially implements: blueprint heka
Change-Id: I70e94f4ef7380c6f376a3066d7ddda042c703637
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 9 | ||||
| -rw-r--r-- | docker/neutron/neutron-base/extend_start.sh | 8 | ||||
| -rw-r--r-- | docker/neutron/neutron-metadata-agent/extend_start.sh | 7 | ||||
| -rw-r--r-- | docker/neutron/neutron-server/extend_start.sh | 7 |
4 files changed, 28 insertions, 3 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index cece61ed7..4084544e4 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -48,17 +48,20 @@ ADD neutron-base-archive /neutron-base-source RUN ln -s neutron-base-source/* neutron \ && useradd --user-group neutron \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /neutron \ - && mkdir -p /etc/neutron /usr/share/neutron /var/lib/neutron /var/log/neutron /home/neutron \ + && mkdir -p /etc/neutron /usr/share/neutron /var/lib/neutron /home/neutron \ && cp -r /neutron/etc/* /etc/neutron/ \ && cp -r /neutron/etc/neutron/* /etc/neutron/ \ && cp /neutron/etc/api-paste.ini /usr/share/neutron \ && mv /etc/neutron/neutron/ /etc/neutron/plugins/ \ - && chown -R neutron: /etc/neutron /usr/share/neutron /var/lib/neutron /var/log/neutron /home/neutron \ + && chown -R neutron: /etc/neutron /usr/share/neutron /var/lib/neutron /home/neutron \ && 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/neutron/rootwrap.conf {% endif %} COPY neutron_sudoers /etc/sudoers.d/neutron_sudoers +COPY extend_start.sh /usr/local/bin/kolla_extend_start + RUN usermod -a -G kolla neutron \ && chmod 750 /etc/sudoers.d \ - && chmod 440 /etc/sudoers.d/neutron_sudoers + && chmod 440 /etc/sudoers.d/neutron_sudoers \ + && chmod 755 /usr/local/bin/kolla_extend_start diff --git a/docker/neutron/neutron-base/extend_start.sh b/docker/neutron/neutron-base/extend_start.sh new file mode 100644 index 000000000..8c71d1a23 --- /dev/null +++ b/docker/neutron/neutron-base/extend_start.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +if [[ ! -d "/var/log/kolla/neutron" ]]; then + mkdir -p /var/log/kolla/neutron +fi +if [[ $(stat -c %a /var/log/kolla/neutron) != "755" ]]; then + chmod 755 /var/log/kolla/neutron +fi diff --git a/docker/neutron/neutron-metadata-agent/extend_start.sh b/docker/neutron/neutron-metadata-agent/extend_start.sh index c46f60f55..aed5134a8 100644 --- a/docker/neutron/neutron-metadata-agent/extend_start.sh +++ b/docker/neutron/neutron-metadata-agent/extend_start.sh @@ -4,3 +4,10 @@ if [[ $(stat -c %U:%G /var/lib/neutron/kolla) != "neutron:neutron" ]]; then sudo chown neutron: /var/lib/neutron/kolla fi + +if [[ ! -d "/var/log/kolla/neutron" ]]; then + mkdir -p /var/log/kolla/neutron +fi +if [[ $(stat -c %a /var/log/kolla/neutron) != "755" ]]; then + chmod 755 /var/log/kolla/neutron +fi diff --git a/docker/neutron/neutron-server/extend_start.sh b/docker/neutron/neutron-server/extend_start.sh index dba1e632f..7247c8de5 100644 --- a/docker/neutron/neutron-server/extend_start.sh +++ b/docker/neutron/neutron-server/extend_start.sh @@ -1,5 +1,12 @@ #!/bin/bash +if [[ ! -d "/var/log/kolla/neutron" ]]; then + mkdir -p /var/log/kolla/neutron +fi +if [[ $(stat -c %a /var/log/kolla/neutron) != "755" ]]; then + chmod 755 /var/log/kolla/neutron +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 |