diff options
| author | Eduardo Gonzalez <dabarren@gmail.com> | 2017-05-16 12:20:09 +0200 |
|---|---|---|
| committer | Eduardo Gonzalez <dabarren@gmail.com> | 2017-05-16 12:20:09 +0200 |
| commit | 85cdb0b89494963615d542b7bbf86bc905539cf9 (patch) | |
| tree | 8c1adbedc75c63c0ba12880e16ceedc1a689eba3 | |
| parent | 3fb53129e2106bee7eb5003e3484cec67cfd55b2 (diff) | |
| download | kolla-85cdb0b89494963615d542b7bbf86bc905539cf9.tar.gz kolla-85cdb0b89494963615d542b7bbf86bc905539cf9.zip | |
Enable manila-data for rpm binary
manila-data package is included as part of
openstack-manila installed in manila-base image.
This change removes exit while building for rpm
binary images.
http://cbs.centos.org/koji/rpminfo?rpmID=86923
Change-Id: I0c8e65a99cd96a3fef159519efd51bdcee1af30f
Closes-Bug: #1671667
| -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 47d7ed757..02960f40a 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -78,7 +78,6 @@ class BuildTestCentosBinary(BuildTest, base.BaseTestCase): "kafka", "karbor-base", "kuryr-base", - "manila-data", "monasca-base", "neutron-bgp-dragent", "neutron-sfc-agent", @@ -199,7 +198,6 @@ class BuildTestOracleLinuxBinary(BuildTest, base.BaseTestCase): "kafka", "karbor-base", "kuryr-base", - "manila-data", "monasca-base", "neutron-bgp-dragent", "neutron-sfc-agent", |