From 85cdb0b89494963615d542b7bbf86bc905539cf9 Mon Sep 17 00:00:00 2001 From: Eduardo Gonzalez Date: Tue, 16 May 2017 12:20:09 +0200 Subject: [PATCH] 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 +------ tests/test_build.py | 2 -- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/docker/manila/manila-data/Dockerfile.j2 b/docker/manila/manila-data/Dockerfile.j2 index f1408a0f1b..eb8a9de9e7 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' diff --git a/tests/test_build.py b/tests/test_build.py index 47d7ed7570..02960f40a8 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -78,7 +78,6 @@ class BuildTestCentosBinary(BuildTest, base.BaseTestCase): "kafka", "karbor-base", "kuryr-base", - "manila-data", "monasca-base", "neutron-bgp-dragent", "neutron-sfc-agent", @@ -199,7 +198,6 @@ class BuildTestOracleLinuxBinary(BuildTest, base.BaseTestCase): "kafka", "karbor-base", "kuryr-base", - "manila-data", "monasca-base", "neutron-bgp-dragent", "neutron-sfc-agent",