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
This commit is contained in:
Eduardo Gonzalez 2017-05-16 12:20:09 +02:00
parent 3fb53129e2
commit 85cdb0b894
2 changed files with 1 additions and 8 deletions

View File

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

View File

@ -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",