From 85cdb0b89494963615d542b7bbf86bc905539cf9 Mon Sep 17 00:00:00 2001 From: Eduardo Gonzalez Date: Tue, 16 May 2017 12:20:09 +0200 Subject: Enable manila-data for rpm binary manila-data package is included as part of openstack-manila installed in manila-base image. This change removes exit while building for rpm binary images. http://cbs.centos.org/koji/rpminfo?rpmID=86923 Change-Id: I0c8e65a99cd96a3fef159519efd51bdcee1af30f Closes-Bug: #1671667 --- docker/manila/manila-data/Dockerfile.j2 | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'docker') diff --git a/docker/manila/manila-data/Dockerfile.j2 b/docker/manila/manila-data/Dockerfile.j2 index f1408a0f1..eb8a9de9e 100644 --- a/docker/manila/manila-data/Dockerfile.j2 +++ b/docker/manila/manila-data/Dockerfile.j2 @@ -6,12 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - - {% elif base_distro in ['debian', 'ubuntu'] %} + {% if base_distro in ['debian', 'ubuntu'] %} {% set manila_data_packages = [ 'manila-data' -- cgit v1.2.3