openstack/kolla-ansible
Code Issues Proposed changes

Fix "wait for log socket" in start.sh

Browse Source 
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
This commit is contained in:
Éric Lemoine 2016-03-07 11:51:55 +01:00
parent ead7752ad6
commit 14dec25e54
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/roles/common/tasks/start.yml
View File

@ -3,6 +3,9 @@
kolla_docker: kolla_docker:
action: "start_container" action: "start_container"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
environment:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
SKIP_LOG_SETUP: "true"
image: "{{ heka_image_full }}" image: "{{ heka_image_full }}"
name: "heka" name: "heka"
volumes: volumes:

2
docker/base/start.sh
View File

@ -3,7 +3,7 @@ set -o errexit
# Wait for the log socket # Wait for the log socket
if [[ ! "${!SKIP_LOG_SETUP[@]}" && -e /var/lib/kolla/heka ]]; then 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 sleep 1
done done
fi fi