diff options
| author | SamYaple <sam@yaple.net> | 2016-02-15 20:49:04 +0000 |
|---|---|---|
| committer | SamYaple <sam@yaple.net> | 2016-02-16 14:42:41 +0000 |
| commit | 690e6853de1215775c672c9cb6be5190887b37da (patch) | |
| tree | 8f6bcecbf4dd6312c2085129c33bfd69d8df1ccf /docker/base/start.sh | |
| parent | 84f43146dc3754501adac14661361b823fb625a1 (diff) | |
| download | kolla-690e6853de1215775c672c9cb6be5190887b37da.tar.gz kolla-690e6853de1215775c672c9cb6be5190887b37da.zip | |
Move socket binding to named_volume
The extend_start.sh script for rsyslog is removed as it is no longer
needed. Docker no longer binds to /dev/log or /run/kolla/log
Closes-Bug: #1544545
Change-Id: Ic0a323a26ee4e9e15baf4598285844a8a4955f23
Diffstat (limited to 'docker/base/start.sh')
| -rw-r--r-- | docker/base/start.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/docker/base/start.sh b/docker/base/start.sh index d75a885f3..d9801d750 100644 --- a/docker/base/start.sh +++ b/docker/base/start.sh @@ -1,6 +1,16 @@ #!/bin/bash set -o errexit +# TODO(SamYaple): After we merge Heka it should be possible to remove +# this symlink, investigate that after Heka is finalized +# NOTE(SamYaple): Setting up logging socket to /dev/log +if [[ ! "${!SKIP_LOG_SETUP[@]}" && -e /var/lib/kolla/rsyslog ]]; then + while [[ ! -S /var/lib/kolla/rsyslog/log ]]; do + sleep 1 + done + sudo ln -sf /var/lib/kolla/rsyslog/log /dev/log +fi + # Processing /var/lib/kolla/config_files/config.json as root. This is necessary # to permit certain files to be controlled by the root user which should # not be writable by the dropped-privileged user, especially /run_command |