diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-22 15:33:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-22 15:33:36 +0000 |
| commit | daec36e477d819c2054937c3b8ea46cca1b2ff6c (patch) | |
| tree | d599510151c8a32f45f659d5a664e4419e3fc744 | |
| parent | f013f2e8160847a386efef95cd58a6f31eabff57 (diff) | |
| parent | b4ebaa50e21dfa9175d3974d82b4c60c13a0c770 (diff) | |
| download | kolla-daec36e477d819c2054937c3b8ea46cca1b2ff6c.tar.gz kolla-daec36e477d819c2054937c3b8ea46cca1b2ff6c.zip | |
Merge "Add binary support for Manila container"
| -rw-r--r-- | docker/manila/manila-base/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/manila/manila-share/Dockerfile.j2 | 9 | ||||
| -rw-r--r-- | tests/test_build.py | 3 |
3 files changed, 14 insertions, 4 deletions
diff --git a/docker/manila/manila-base/Dockerfile.j2 b/docker/manila/manila-base/Dockerfile.j2 index adbcc9711..24a951fd5 100644 --- a/docker/manila/manila-base/Dockerfile.j2 +++ b/docker/manila/manila-base/Dockerfile.j2 @@ -2,10 +2,12 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} 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 +RUN yum -y install openstack-manila \ + && yum clean all + {% endif %} {% elif install_type == 'source' %} ADD manila-base-archive /manila-base-source diff --git a/docker/manila/manila-share/Dockerfile.j2 b/docker/manila/manila-share/Dockerfile.j2 index a3ca1820b..8a57896ac 100644 --- a/docker/manila/manila-share/Dockerfile.j2 +++ b/docker/manila/manila-share/Dockerfile.j2 @@ -1,6 +1,15 @@ FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }} MAINTAINER {{ maintainer }} +{% if install_type == 'binary' %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + +RUN yum -y install openstack-manila-share \ + && yum clean all + + {% endif %} +{% endif %} + {{ include_footer }} USER manila diff --git a/tests/test_build.py b/tests/test_build.py index 8fec97ebb..bfc334f96 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -47,8 +47,7 @@ class BuildTest(base.BaseTestCase): "murano-base", "ironic-pxe", "ironic-discoverd", - "mistral-base", - "manila-base"] + "mistral-base"] failures = 0 for image, result in six.iteritems(bad_results): |