From 9eb38405b7bf5575957860ae1da91c31279bf06d Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 7 Oct 2016 15:42:38 -0300 Subject: ansible: swift: Fix swift-object-expirer restart loop The swift-object-expirer is provided by the 'openstack-swift-proxy' package and thus it is unavailable on swift-object image. This change adds a new Docker image to fulfill this requirement and stop using swift-object image in this case. This image is needed while RDO does not fix the packaging. The issue is being tracked in: https://bugzilla.redhat.com/show_bug.cgi?id=1382921 Change-Id: Idc7ee92d756d8923da2198ede33abf5ed1142041 Closes-Bug: 1630425 --- docker/swift/swift-object-expirer/Dockerfile.j2 | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 docker/swift/swift-object-expirer/Dockerfile.j2 (limited to 'docker') diff --git a/docker/swift/swift-object-expirer/Dockerfile.j2 b/docker/swift/swift-object-expirer/Dockerfile.j2 new file mode 100644 index 000000000..e451aec44 --- /dev/null +++ b/docker/swift/swift-object-expirer/Dockerfile.j2 @@ -0,0 +1,25 @@ +FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} +MAINTAINER {{ maintainer }} + +{% block swift_object_expirer_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{% if install_type == 'binary' %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + # RDO has it packaged in the wrong package for now. The issue is being + # tracked in https://bugzilla.redhat.com/show_bug.cgi?id=1382921 + {% set swift_object_expirer_packages = ['openstack-swift-proxy'] %} + {% elif base_distro in ['ubuntu'] %} + {% set swift_object_expirer_packages = ['swift-object'] %} + {% endif %} + +{{ macros.install_packages(swift_object_expirer_packages | customizable("packages")) }} + +{% endif %} + +{% block swift_object_expirer_footer %}{% endblock %} +{% block footer %}{% endblock %} +{{ include_footer }} + +USER swift -- cgit v1.2.3