diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-25 13:50:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-25 13:50:16 +0000 |
| commit | 00f35e55907d54bacd291ebaab684d7b26420c37 (patch) | |
| tree | 16007cefaaf79415d97cb6493cfd30581a9a7b99 /docker/haproxy/start.sh | |
| parent | 0f297ed0ee9e9a2eedf8c846e200321fd0070072 (diff) | |
| parent | 89ecfc164ed92696de4c5cd2c0f90f23c1ad3784 (diff) | |
| download | kolla-00f35e55907d54bacd291ebaab684d7b26420c37.tar.gz kolla-00f35e55907d54bacd291ebaab684d7b26420c37.zip | |
Merge "Replace config-external - haproxy keepalived"
Diffstat (limited to 'docker/haproxy/start.sh')
| -rwxr-xr-x | docker/haproxy/start.sh | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/docker/haproxy/start.sh b/docker/haproxy/start.sh index d1da4a607..629c85254 100755 --- a/docker/haproxy/start.sh +++ b/docker/haproxy/start.sh @@ -1,17 +1,15 @@ #!/bin/bash set -o errexit -CMD='/usr/sbin/haproxy' -ARGS="-f /etc/haproxy/haproxy.cfg -p /run/haproxy.pid" - # Loading common functions. source /opt/kolla/kolla-common.sh -# Execute config strategy -set_configs +# Generate run command +python /opt/kolla/set_configs.py +CMD=$(cat /run_command) # We are intentionally not using exec so we can reload the haproxy config later -$CMD $ARGS +$CMD # TODO(SamYaple): This has the potential for a race condition triggered by a # config reload that could cause the container to exit |