diff options
| author | Éric Lemoine <elemoine@mirantis.com> | 2016-03-07 11:51:55 +0100 |
|---|---|---|
| committer | Éric Lemoine <elemoine@mirantis.com> | 2016-03-07 13:21:38 +0100 |
| commit | 14dec25e54eb0507d35b86abee8030c6878c6566 (patch) | |
| tree | d3f30aedefb4e3047fc296808c022784eadebf82 | |
| parent | ead7752ad6b860cd510be21ba372544ddfb7b3e5 (diff) | |
| download | kolla-14dec25e54eb0507d35b86abee8030c6878c6566.tar.gz kolla-14dec25e54eb0507d35b86abee8030c6878c6566.zip | |
Fix "wait for log socket" in start.sh
The code in docker/base/start.sh that waits for the log socket does
not work because it includes a bad "space" character after "-S".
This patch changes that character to a real "space" character. It
also sets the SKIP_LOG_SETUP envvar for the Heka container.
TrivialFix
Change-Id: I17a3005df5bbd57678350fc77030e44b5ad6acae
| -rw-r--r-- | ansible/roles/common/tasks/start.yml | 3 | ||||
| -rw-r--r-- | docker/base/start.sh | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ansible/roles/common/tasks/start.yml b/ansible/roles/common/tasks/start.yml index e9a1b78bd..c6e44d598 100644 --- a/ansible/roles/common/tasks/start.yml +++ b/ansible/roles/common/tasks/start.yml @@ -3,6 +3,9 @@ kolla_docker: action: "start_container" common_options: "{{ docker_common_options }}" + environment: + KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" + SKIP_LOG_SETUP: "true" image: "{{ heka_image_full }}" name: "heka" volumes: diff --git a/docker/base/start.sh b/docker/base/start.sh index fd989584d..b45660bd8 100644 --- a/docker/base/start.sh +++ b/docker/base/start.sh @@ -3,7 +3,7 @@ set -o errexit # Wait for the log socket if [[ ! "${!SKIP_LOG_SETUP[@]}" && -e /var/lib/kolla/heka ]]; then - while [[ ! -S /var/lib/kolla/heka/log ]]; do + while [[ ! -S /var/lib/kolla/heka/log ]]; do sleep 1 done fi |