aboutsummaryrefslogtreecommitdiff
path: root/docker/macros.j2
diff options
context:
space:
mode:
Diffstat (limited to 'docker/macros.j2')
-rw-r--r--docker/macros.j211
1 files changed, 0 insertions, 11 deletions
diff --git a/docker/macros.j2 b/docker/macros.j2
index 24083bcc0..e40206071 100644
--- a/docker/macros.j2
+++ b/docker/macros.j2
@@ -41,17 +41,6 @@ RUN usermod --append --home {{ homedir }} --groups kolla {{ name }} \
&& chown -R {{ user.uid }}:{{ user.gid }} {{ homedir }}
{% endmacro %}
-
-{% macro ubuntu_trove_bug_1651852() %}
-{# NOTE(SamYaple): The postinst script breaks because it calls getenv instead of getent #}
-{# TODO(SamYaple): Remove once issue is fixed -- https://bugs.launchpad.net/ubuntu/+source/openstack-trove/+bug/1651852 #}
-RUN apt-get -y install --no-install-recommends trove-common \
- || sed -i 's/getenv/getent/g' /var/lib/dpkg/info/trove-common.postinst \
- && apt-get -y install -f \
- && apt-get clean
-{% endmacro %}
-
-
{% macro debian_haproxy_existing_user_fix() %}
{# NOTE(SamYaple): The postinst script breaks if the user 'haproxy' already exists #}
RUN apt-get -y install --no-install-recommends haproxy \