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
changes/75/289275/2
Éric Lemoine 7 years ago
parent ead7752ad6
commit 14dec25e54
  1. 3
      ansible/roles/common/tasks/start.yml
  2. 2
      docker/base/start.sh

@ -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:

@ -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

Loading…
Cancel
Save