openstack/kolla
Code Issues Proposed changes

Merge "Enable manila-data for rpm binary"

Browse Source
This commit is contained in:
Jenkins 2017-06-04 16:04:24 +00:00 committed by Gerrit Code Review
commit ffbd1040c7
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker/manila/manila-data/Dockerfile.j2
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'

2
tests/test_build.py
View File

@ -79,7 +79,6 @@ class BuildTestCentosBinary(BuildTest, base.BaseTestCase):
"kafka",
"karbor-base",
"kuryr-base",
"manila-data",
"monasca-base",
"neutron-bgp-dragent",
"neutron-sfc-agent",
@ -209,7 +208,6 @@ class BuildTestOracleLinuxBinary(BuildTest, base.BaseTestCase):
"kafka",
"karbor-base",
"kuryr-base",
"manila-data",
"monasca-base",
"neutron-bgp-dragent",
"neutron-sfc-agent",