diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-04 07:44:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-04 07:44:21 +0000 |
| commit | 9d138fe835eef7c74a3c21bc829d53f95d7b1c4d (patch) | |
| tree | d0625a5856fe8671deebf63e9912964d7c91af66 | |
| parent | 16d772cd53dc896a2e6597e34074113710fd2a31 (diff) | |
| parent | a6ccbe1803c885ccbddfda1499f5ebb3102f2d8e (diff) | |
| download | kolla-9d138fe835eef7c74a3c21bc829d53f95d7b1c4d.tar.gz kolla-9d138fe835eef7c74a3c21bc829d53f95d7b1c4d.zip | |
Merge "Fix Manila-data binary distro"
| -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", |