diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-07 16:15:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-07 16:15:43 +0000 |
| commit | 5e547639b3bde520f3ee34de75fe8f2a0608a079 (patch) | |
| tree | 96e37565a5f1c185bc323793f47cac2153c4d35f | |
| parent | b0b891ed60e38b5f1ae8bd3f0b8fce51700ea1aa (diff) | |
| parent | 14dec25e54eb0507d35b86abee8030c6878c6566 (diff) | |
| download | kolla-5e547639b3bde520f3ee34de75fe8f2a0608a079.tar.gz kolla-5e547639b3bde520f3ee34de75fe8f2a0608a079.zip | |
Merge "Fix "wait for log socket" in start.sh"
| -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 |