diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-30 16:42:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-30 16:42:12 +0000 |
| commit | 15eb390ab307885943280a4b5d1287dc580517aa (patch) | |
| tree | b3428c473c6b2eef0c2802d07b48f26a78643010 /docker/centos/binary | |
| parent | d4c7129dc30008f70ac07903aa27fdcd7b819321 (diff) | |
| parent | 2d920745a45eec166e2c381aa7b15b1168b03887 (diff) | |
| download | kolla-15eb390ab307885943280a4b5d1287dc580517aa.tar.gz kolla-15eb390ab307885943280a4b5d1287dc580517aa.zip | |
Merge "Ansible install of HAProxy"
Diffstat (limited to 'docker/centos/binary')
| -rwxr-xr-x | docker/centos/binary/haproxy/Dockerfile | 2 | ||||
| l--------- | docker/centos/binary/haproxy/ensure_latest_config.sh | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/docker/centos/binary/haproxy/Dockerfile b/docker/centos/binary/haproxy/Dockerfile index 40f2af610..8e1a05f18 100755 --- a/docker/centos/binary/haproxy/Dockerfile +++ b/docker/centos/binary/haproxy/Dockerfile @@ -6,6 +6,6 @@ RUN yum -y install \ && yum clean all COPY start.sh / -COPY config-external.sh /opt/kolla/ +COPY config-external.sh ensure_latest_config.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/binary/haproxy/ensure_latest_config.sh b/docker/centos/binary/haproxy/ensure_latest_config.sh new file mode 120000 index 000000000..80c50f32a --- /dev/null +++ b/docker/centos/binary/haproxy/ensure_latest_config.sh @@ -0,0 +1 @@ +../../../common/haproxy/ensure_latest_config.sh
\ No newline at end of file |