diff options
| author | Marc Koderer <marc@koderer.com> | 2016-01-19 09:08:32 +0100 |
|---|---|---|
| committer | Marc Koderer <marc@koderer.com> | 2016-01-22 09:05:06 +0100 |
| commit | b4ebaa50e21dfa9175d3974d82b4c60c13a0c770 (patch) | |
| tree | 4165db450f7d53e3d67f09d20d2f36a3d49c2012 | |
| parent | 5c4c8636ff8723879a0de8db278fadd9e83c70cd (diff) | |
| download | kolla-b4ebaa50e21dfa9175d3974d82b4c60c13a0c770.tar.gz kolla-b4ebaa50e21dfa9175d3974d82b4c60c13a0c770.zip | |
Add binary support for Manila container
Change-Id: Iea77fa26c17e120b5c0487eca8a76972281ee99a
Partially-Implements: blueprint enable-manila-containers
| -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): |