diff options
| author | Michal Jastrzebski <inc007@gmail.com> | 2015-10-01 12:36:00 +0200 |
|---|---|---|
| committer | Michal Jastrzebski <inc007@gmail.com> | 2015-10-07 11:32:28 +0200 |
| commit | 865ba802317f1680b1e70f001bf95e3f9fa8a2c4 (patch) | |
| tree | e53d17bec9918f505b6a3265f482e29fd700d695 /docker/logging | |
| parent | e230c0752e779f8f65a8f1f0efc7675984bb3fb0 (diff) | |
| download | kolla-865ba802317f1680b1e70f001bf95e3f9fa8a2c4.tar.gz kolla-865ba802317f1680b1e70f001bf95e3f9fa8a2c4.zip | |
Removing /dev/log on rsyslog start
Currently we seem to be experiencing races between containers.
If another containers tries to write to rsyslog before rsyslog container
is up and running it will create /dev/log as directory,
and that will prevent rsyslog from starting.
Change-Id: I88ac27693d12e605f95e3a945fc98783516d7933
Closes-Bug: #1501694
backport: liberty
Diffstat (limited to 'docker/logging')
| -rw-r--r-- | docker/logging/rsyslog/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/logging/rsyslog/extend_start.sh | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/docker/logging/rsyslog/Dockerfile.j2 b/docker/logging/rsyslog/Dockerfile.j2 index db58b799a..c74aecaf2 100644 --- a/docker/logging/rsyslog/Dockerfile.j2 +++ b/docker/logging/rsyslog/Dockerfile.j2 @@ -13,4 +13,6 @@ RUN apt-get install -y --no-install-recommends rsyslog \ {% endif %} +COPY extend_start.sh /usr/local/bin/kolla_extend_start + {{ include_footer }} diff --git a/docker/logging/rsyslog/extend_start.sh b/docker/logging/rsyslog/extend_start.sh new file mode 100644 index 000000000..0742fa0a2 --- /dev/null +++ b/docker/logging/rsyslog/extend_start.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +if [[ -e "/dev/log" ]]; then + rm -rf /dev/log +fi |