diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-11-29 17:20:14 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-11-29 17:20:14 +0100 |
| commit | 70ef9a4fee0f39ff64281246968d2deb175bb4af (patch) | |
| tree | 0779fcde6517ed9f75d64810a3edf14bfc8c44b3 /docker/opendaylight | |
| parent | 0bc6348ea5e4b488e61933d5e561e4d7eb2d9efc (diff) | |
| download | kolla-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/opendaylight')
| -rw-r--r-- | docker/opendaylight/Dockerfile.j2 | 7 |
1 files changed, 0 insertions, 7 deletions
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")) }} |