1 files changed, 7 insertions, 2 deletions
diff --git a/docker/haproxy/Dockerfile.j2 b/docker/haproxy/Dockerfile.j2
index 6857087bd..964e0e663 100644
--- a/docker/haproxy/Dockerfile.j2
+++ b/docker/haproxy/Dockerfile.j2
@@ -5,14 +5,19 @@ MAINTAINER {{ maintainer }}
 
 {% import "macros.j2" as macros with context %}
 
+{{ macros.configure_user(name='haproxy') }}
+
+{% if base_distro in ['ubuntu', 'debian'] %}
+{{ macros.debian_haproxy_existing_user_fix() }}
+{% endif %}
+
 {% set haproxy_packages = [
     'haproxy',
     'socat'
 ] %}
 {{ macros.install_packages(haproxy_packages | customizable("packages")) }}
 
-RUN usermod -a -G kolla haproxy \
-    && mkdir -p /var/lib/kolla/haproxy \
+RUN mkdir -p /var/lib/kolla/haproxy \
     && chown -R haproxy: /var/lib /run
 
 COPY ensure_latest_config.sh /usr/local/bin/kolla_ensure_haproxy_latest_config