summaryrefslogtreecommitdiff
path: root/docker/haproxy
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2019-11-29 17:20:14 +0100
committerMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2019-11-29 17:20:14 +0100
commit70ef9a4fee0f39ff64281246968d2deb175bb4af (patch)
tree0779fcde6517ed9f75d64810a3edf14bfc8c44b3 /docker/haproxy
parent0bc6348ea5e4b488e61933d5e561e4d7eb2d9efc (diff)
downloadkolla-70ef9a4fee0f39ff64281246968d2deb175bb4af.tar.gz
kolla-70ef9a4fee0f39ff64281246968d2deb175bb4af.zip
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
Diffstat (limited to 'docker/haproxy')
-rw-r--r--docker/haproxy/Dockerfile.j24
1 files changed, 0 insertions, 4 deletions
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'
] %}