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/trove/trove-base/Dockerfile.j2 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'docker/trove') 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