diff options
| author | Mauricio Lima <mauriciolimab@gmail.com> | 2016-11-03 13:02:18 -0300 |
|---|---|---|
| committer | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-11-04 04:51:16 +0000 |
| commit | a6ccbe1803c885ccbddfda1499f5ebb3102f2d8e (patch) | |
| tree | 070803fed1e78bcd25482ed8b5aacc89403decd9 | |
| parent | 7de2e5202b9607fe1b5debb18a864920140bdbdf (diff) | |
| download | kolla-a6ccbe1803c885ccbddfda1499f5ebb3102f2d8e.tar.gz kolla-a6ccbe1803c885ccbddfda1499f5ebb3102f2d8e.zip | |
Fix Manila-data binary distro
Closes-Bug: #1639011
Change-Id: Icc4e798590645910de1a86eaf46082343d999f6a
| -rw-r--r-- | docker/manila/manila-data/Dockerfile.j2 | 7 | ||||
| -rw-r--r-- | tests/test_build.py | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/docker/manila/manila-data/Dockerfile.j2 b/docker/manila/manila-data/Dockerfile.j2 index 8878d1acb..b1777bfae 100644 --- a/docker/manila/manila-data/Dockerfile.j2 +++ b/docker/manila/manila-data/Dockerfile.j2 @@ -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")) }} diff --git a/tests/test_build.py b/tests/test_build.py index 1a89821e0..db2cf3713 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -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", |