From 70ef9a4fee0f39ff64281246968d2deb175bb4af Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz 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/opendaylight/Dockerfile.j2 | 7 ------- 1 file changed, 7 deletions(-) (limited to 'docker/opendaylight') diff --git a/docker/opendaylight/Dockerfile.j2 b/docker/opendaylight/Dockerfile.j2 index 9e2e24b45..b0900400e 100644 --- a/docker/opendaylight/Dockerfile.j2 +++ b/docker/opendaylight/Dockerfile.j2 @@ -26,13 +26,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'opendaylight', 'openjdk-' + java_version + '-jre-headless', ] %} - - # NOTE(egonzalez): ODL fails to install in debian family images with - # existing odl user. First install odl and then allow usage of - # install_packages macro for custom configs. - {% block debian_opendaylight_install_fix_block %} - {{ macros.debian_opendaylight_existing_user_fix() }} - {% endblock %} {% endif %} {{ macros.install_packages(opendaylight_packages | customizable("packages")) }} -- cgit v1.2.3