diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-09 17:19:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-09 17:19:54 +0000 |
| commit | 45e1e37d4f4fdd1131bda96a92774e88a70ee526 (patch) | |
| tree | ce8dfa98cd657b73806006ed289ac7710cedd743 /docker | |
| parent | 3d10fff6893ea8eed89f07baf0ed98d31cd637d6 (diff) | |
| parent | b9312c63e101bdb9fc46cfd389d9c34151075811 (diff) | |
| download | kolla-45e1e37d4f4fdd1131bda96a92774e88a70ee526.tar.gz kolla-45e1e37d4f4fdd1131bda96a92774e88a70ee526.zip | |
Merge "Remove config-internal for haproxy"
Diffstat (limited to 'docker')
| -rw-r--r--[-rwxr-xr-x] | docker/common/haproxy/config-external.sh | 0 | ||||
| -rwxr-xr-x | docker/common/haproxy/start.sh | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/docker/common/haproxy/config-external.sh b/docker/common/haproxy/config-external.sh index 0c41a5bdb..0c41a5bdb 100755..100644 --- a/docker/common/haproxy/config-external.sh +++ b/docker/common/haproxy/config-external.sh diff --git a/docker/common/haproxy/start.sh b/docker/common/haproxy/start.sh index c39184767..d1da4a607 100755 --- a/docker/common/haproxy/start.sh +++ b/docker/common/haproxy/start.sh @@ -7,7 +7,7 @@ ARGS="-f /etc/haproxy/haproxy.cfg -p /run/haproxy.pid" # Loading common functions. source /opt/kolla/kolla-common.sh -# Config-internal script exec out of this function, it does not return here. +# Execute config strategy set_configs # We are intentionally not using exec so we can reload the haproxy config later |