openstack/kolla
Code Issues Proposed changes

Fix Manila-data binary distro

Browse Source 
Closes-Bug: #1639011

Change-Id: Icc4e798590645910de1a86eaf46082343d999f6a
This commit is contained in:
Mauricio Lima 2016-11-03 13:02:18 -03:00 committed by Jeffrey Zhang
parent 7de2e5202b
commit a6ccbe1803
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker/manila/manila-data/Dockerfile.j2
View File

@ -8,8 +8,13 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% elif base_distro in ['ubuntu'] %}
{% set manila_data_packages = [
'manila-data'
'manila-data'
] %}
{{ macros.install_packages(manila_data_packages | customizable("packages")) }}

2
tests/test_build.py
View File

@ -70,6 +70,7 @@ class BuildTestCentosBinary(BuildTest, base.BaseTestCase):
"searchlight-base",
"senlin-base",
"vmtp",
"manila-data",
"watcher-base",
"congress-base",
"bifrost-base",
@ -123,6 +124,7 @@ class BuildTestOracleLinuxBinary(BuildTest, base.BaseTestCase):
"searchlight-base",
"senlin-base",
"vmtp",
"manila-data",
"watcher-base",
"congress-base",
"bifrost-base",