diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-19 21:18:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-19 21:18:35 +0000 |
| commit | 01b044f493f7d30850a834aacbdb235db2446cbf (patch) | |
| tree | 0e8e95ed4b8725265b351aa6674762f402e152da /docker | |
| parent | cbb46f631a479a5142d50131503e3044642e10c4 (diff) | |
| parent | 916925c9a80f90fbe2c18cbfd9b6499257431e2b (diff) | |
| download | kolla-01b044f493f7d30850a834aacbdb235db2446cbf.tar.gz kolla-01b044f493f7d30850a834aacbdb235db2446cbf.zip | |
Merge "Add Heka to common role"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/start.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/docker/base/start.sh b/docker/base/start.sh index d9801d750..a42c01391 100644 --- a/docker/base/start.sh +++ b/docker/base/start.sh @@ -11,6 +11,13 @@ if [[ ! "${!SKIP_LOG_SETUP[@]}" && -e /var/lib/kolla/rsyslog ]]; then sudo ln -sf /var/lib/kolla/rsyslog/log /dev/log fi +# Wait for the log socket +if [[ ! "${!SKIP_LOG_SETUP[@]}" && -e /var/lib/kolla/heka ]]; then + while [[ ! -S /var/lib/kolla/heka/log ]]; do + sleep 1 + done +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 |