From 76bc0f69cc801a5e5796f1a8a70c13d6355bd6c8 Mon Sep 17 00:00:00 2001 From: Bertrand Lallau Date: Wed, 29 Mar 2017 14:20:13 +0200 Subject: Remove Ubuntu Trove postinst script hack trove-common version 1:7.0.0-0ubuntu1~cloud0 coming from the following repo https://github.com/openstack/kolla/blob/master/docker/base/sources.list.ubuntu#L11 has been fixed. Temporary hack must be removed. Change-Id: I19ce6f0a5d5f0fe0d390fcb05f775f860abd146c --- docker/macros.j2 | 11 ----------- docker/trove/trove-base/Dockerfile.j2 | 3 +-- 2 files changed, 1 insertion(+), 13 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 \ diff --git a/docker/trove/trove-base/Dockerfile.j2 b/docker/trove/trove-base/Dockerfile.j2 index f1cc2d72c..2682c5a3b 100644 --- a/docker/trove/trove-base/Dockerfile.j2 +++ b/docker/trove/trove-base/Dockerfile.j2 @@ -12,8 +12,7 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set trove_base_packages = ['openstack-trove-common'] %} {% elif base_distro in ['debian', 'ubuntu'] %} - {{ macros.ubuntu_trove_bug_1651852() }} - {% set trove_base_packages = [] %} + {% set trove_base_packages = ['trove-common'] %} {% endif %} {{ macros.install_packages(trove_base_packages | customizable("packages")) }} -- cgit v1.2.3