diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-04 16:04:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-04 16:04:24 +0000 |
| commit | ffbd1040c78b12bdb3725cdc8f22fea3c44af24d (patch) | |
| tree | 28fd91b29df16fede9661be5301c9dd3631a2df1 | |
| parent | 3443eaddcdd859f8a411687910339e19ca044cb2 (diff) | |
| parent | 85cdb0b89494963615d542b7bbf86bc905539cf9 (diff) | |
| download | kolla-ffbd1040c78b12bdb3725cdc8f22fea3c44af24d.tar.gz kolla-ffbd1040c78b12bdb3725cdc8f22fea3c44af24d.zip | |
Merge "Enable manila-data for rpm binary"
| -rw-r--r-- | docker/manila/manila-data/Dockerfile.j2 | 7 | ||||
| -rw-r--r-- | tests/test_build.py | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/docker/manila/manila-data/Dockerfile.j2 b/docker/manila/manila-data/Dockerfile.j2 index f1408a0f1..eb8a9de9e 100644 --- a/docker/manila/manila-data/Dockerfile.j2 +++ b/docker/manila/manila-data/Dockerfile.j2 @@ -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' diff --git a/tests/test_build.py b/tests/test_build.py index bba5101c4..2d99168c7 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -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", |