5 files changed, 0 insertions, 49 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'
 ] %}
diff --git a/docker/macros.j2 b/docker/macros.j2
index aedb7b0b7..8a9c42f6b 100644
--- a/docker/macros.j2
+++ b/docker/macros.j2
@@ -72,33 +72,6 @@ RUN usermod --append --home {{ homedir }} --groups kolla {{ name }} \
     && chown -R {{ user.uid }}:{{ user.gid }} {{ homedir }}
 {% endmacro %}
 
-{% macro debian_fix_existing_user(package, lines) %}
-RUN apt-get update \
-    && apt-get -y install --no-install-recommends {{ package }} \
-    || sed -i '/adduser/,+{{ lines }} d' /var/lib/dpkg/info/{{ package }}.postinst \
-    && echo "configuring packages" \
-    && dpkg --configure -a \
-    && echo "done" \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-{% endmacro %}
-
-{% macro debian_haproxy_existing_user_fix() %}
-{# NOTE(SamYaple): The postinst script breaks if the user 'haproxy' already exists #}
-    {{ debian_fix_existing_user('haproxy', 1) }}
-{% endmacro %}
-
-{% macro debian_mongodb_existing_user_fix() %}
-{# NOTE(hrw): The postinst script breaks if the user 'mongodb' already exists #}
-{# TODO(hrw): Version in Debian 'testing' checks does user exists #}
-    {{ debian_fix_existing_user('mongodb-server', 3) }}
-{% endmacro %}
-
-{% macro debian_opendaylight_existing_user_fix() %}
-{# NOTE(egonzalez): The postinst script breaks if the user 'odl' already exists #}
-    {{ debian_fix_existing_user('opendaylight', 1) }}
-{% endmacro %}
-
 {% macro install_fluent_plugins(binary, plugins, chain=False) -%}
 {% if plugins is defined and plugins|length > 0 -%}
     {% if not chain -%} RUN {% endif -%}
diff --git a/docker/mongodb/Dockerfile.j2 b/docker/mongodb/Dockerfile.j2
index ab32aa7e0..2a9c3312e 100644
--- a/docker/mongodb/Dockerfile.j2
+++ b/docker/mongodb/Dockerfile.j2
@@ -18,11 +18,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
     ] %}
 {% endif %}
 
-{% if base_distro in ['debian'] %}
-    {# NOTE(hrw) Ubuntu does not need that #}
-    {{ macros.debian_mongodb_existing_user_fix() }}
-{% endif %}
-
 {{ macros.install_packages(mongodb_packages | customizable("packages")) }}
 
 COPY mongodb_sudoers /etc/sudoers.d/kolla_mongodb_sudoers
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")) }}
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")) }}