From 70ef9a4fee0f39ff64281246968d2deb175bb4af Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Date: Fri, 29 Nov 2019 17:20:14 +0100
Subject: drop *_existing_user_fix macros

Commit 109706aa8b26f6f915e1cadae89de8135c3b68bf bumped 'system' users
beyond range used by Kolla. So Debian/Ubuntu does not complain that
system users created by packages exist already on package install.

Change-Id: I9bf4b240839d46088ac668f26cf065dd5e3775c2
---
 docker/haproxy/Dockerfile.j2 | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'docker/haproxy')

diff --git a/docker/haproxy/Dockerfile.j2 b/docker/haproxy/Dockerfile.j2
index 8615fdfae..19ddeeb56 100644
--- a/docker/haproxy/Dockerfile.j2
+++ b/docker/haproxy/Dockerfile.j2
@@ -7,10 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.configure_user(name='haproxy') }}
 
-{% if base_package_type == 'deb' %}
-{{ macros.debian_haproxy_existing_user_fix() }}
-{% endif %}
-
 {% set haproxy_packages = [
     'haproxy'
 ] %}
-- 
cgit v1.2.3