diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-06 19:23:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-06 19:23:38 +0000 |
| commit | d3f7eee9c19adf22b5afea1903a901090350db2e (patch) | |
| tree | 586fc5c683d9cde938b9e83e55a0395640ccf162 /docker/haproxy/Dockerfile.j2 | |
| parent | ba4bcdbbe84a42e0346c0e36abf0d1cbc5007444 (diff) | |
| parent | de6650874da1470f10d4561fd1e33829eaef3414 (diff) | |
| download | kolla-d3f7eee9c19adf22b5afea1903a901090350db2e.tar.gz kolla-d3f7eee9c19adf22b5afea1903a901090350db2e.zip | |
Merge "Start the haproxy by using haproxy-system-wrapper"
Diffstat (limited to 'docker/haproxy/Dockerfile.j2')
| -rw-r--r-- | docker/haproxy/Dockerfile.j2 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/docker/haproxy/Dockerfile.j2 b/docker/haproxy/Dockerfile.j2 index e4ee3664d..38f5dc5c1 100644 --- a/docker/haproxy/Dockerfile.j2 +++ b/docker/haproxy/Dockerfile.j2 @@ -14,7 +14,6 @@ RUN apt-get install -y --no-install-recommends haproxy \ {% endif %} COPY ensure_latest_config.sh /usr/local/bin/kolla_ensure_haproxy_latest_config -COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_ensure_haproxy_latest_config +RUN chmod 755 /usr/local/bin/kolla_ensure_haproxy_latest_config {{ include_footer }} |