From 14dec25e54eb0507d35b86abee8030c6878c6566 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Lemoine?= <elemoine@mirantis.com>
Date: Mon, 7 Mar 2016 11:51:55 +0100
Subject: [PATCH] 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
---
 ansible/roles/common/tasks/start.yml | 3 +++
 docker/base/start.sh                 | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ansible/roles/common/tasks/start.yml b/ansible/roles/common/tasks/start.yml
index e9a1b78bd3..c6e44d5982 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 fd989584d0..b45660bd8f 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