Merge "HAProxy container"

docker/centos/binary/haproxy/Dockerfile

+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+RUN yum -y install \
+        haproxy \
+    && yum clean all
+
+COPY start.sh /
+COPY config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]

docker/centos/binary/haproxy/build

+../../../../tools/build-docker-image
\ No newline at end of file

docker/centos/binary/haproxy/config-external.sh

+../../../common/haproxy/config-external.sh
\ No newline at end of file

docker/centos/binary/haproxy/start.sh

+../../../common/haproxy/start.sh
\ No newline at end of file

docker/common/haproxy/config-external.sh

+#!/bin/bash
+SOURCE="/opt/kolla/haproxy/haproxy.cfg"
+TARGET="/etc/haproxy/haproxy.cfg"
+OWNER="root"
+
+if [[ -f "$SOURCE" ]]; then
+    rm $TARGET
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi

docker/common/haproxy/start.sh

+#!/bin/bash
+set -o errexit
+
+CMD='/usr/sbin/haproxy'
+# Parameters:
+# -db for non-daemon execution and logging to stdout
+# -p pidfile to specify pidfile and allow hot reconfiguration
+# loop which generates -f file.conf for each file in /etc/haproxy and /etc/haproxy/conf.d
+ARGS="-db -f /etc/haproxy/haproxy.cfg"
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Config-internal script exec out of this function, it does not return here.
+set_configs
+
+exec $CMD $ARGS

docs/minimal-environment-vars.md

@@ -229,6 +229,10 @@ In order for each service to function, there is a minimum set of required variab
     GLANCE_DB_USER
     MARIADB_SERVICE_HOST
 
+# Haproxy
+
+    None
+
 # Hautoproxy
 
     None