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/neutron | |
| 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/neutron')
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 68f8316d1..d7f9b2a37 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -7,10 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='neutron') }} -{% if base_package_type == 'deb' %} -{{ macros.debian_haproxy_existing_user_fix() }} -{% endif %} - {% if install_type == 'binary' %} {% if base_package_type == 'rpm' %} @@ -61,8 +57,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build # FIXED(jeffrey4l): UCA rocky release is not include python-vmware-nsx # 13.0.0 package now. add 'python-vmware-nsx' into # neutron_base_packages list after UCA fixed the issue. - - {{ macros.debian_haproxy_existing_user_fix() }} {% endif %} {{ macros.install_packages(neutron_base_packages | customizable("packages")) }} |