Merge "Configure AAI HA Proxy to distribute the load to multiple AAI service replicas...

[aai/aai-common.git] / aai-common-docker / aai-haproxy-image / src / main / docker / docker-entrypoint.sh

diff --git a/aai-common-docker/aai-haproxy-image/src/main/docker/docker-entrypoint.sh b/aai-common-docker/aai-haproxy-image/src/main/docker/docker-entrypoint.sh
index a56eea9..a8e521f 100644 (file)
--- a/aai-common-docker/aai-haproxy-image/src/main/docker/docker-entrypoint.sh
+++ b/aai-common-docker/aai-haproxy-image/src/main/docker/docker-entrypoint.sh
@@ -14,9 +14,11 @@ sed -i 's/${ONAP_NAMESERVER_CLUSTER_IP}/'${NAMESERVER_IP}'/g' /usr/local/etc/hap
 }
 
 if [ "$1" = 'haproxy' ]; then
-    # if the user wants "haproxy", let's use "haproxy-systemd-wrapper" instead so we can have proper reloadability implemented by upstream
-    shift # "haproxy"
-    set -- "$(which haproxy-systemd-wrapper)" -p /usr/local/etc/haproxy/haproxy.pid "$@"
+       shift # "haproxy"
+       # if the user wants "haproxy", let's add a couple useful flags
+       #   -W  -- "master-worker mode" (similar to the old "haproxy-systemd-wrapper"; allows for reload via "SIGUSR2")
+       #   -db -- disables background mode
+       set -- haproxy -W -db "$@"
 fi
 
 exec "$@"