openstack/kolla
Code Issues Proposed changes

Remove Ubuntu Trove postinst script hack

Browse Source 
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
This commit is contained in:
Bertrand Lallau 2017-03-29 14:20:13 +02:00
parent 3bd8fe8e10
commit 76bc0f69cc
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docker/macros.j2
View File

@ -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 \

3
docker/trove/trove-base/Dockerfile.j2
View File

@ -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")) }}