openstack/kolla-ansible
Code Issues Proposed changes

Merge "Add binary support for Manila container"

Browse Source
This commit is contained in:
Jenkins 2016-01-22 15:33:36 +00:00 committed by Gerrit Code Review
commit daec36e477
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/manila/manila-base/Dockerfile.j2
View File

@ -2,10 +2,12 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ RUN yum -y install openstack-manila \
&& /bin/false && yum clean all
{% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
ADD manila-base-archive /manila-base-source ADD manila-base-archive /manila-base-source

9
docker/manila/manila-share/Dockerfile.j2
View File

@ -1,6 +1,15 @@
FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }}
MAINTAINER {{ maintainer }} 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 }} {{ include_footer }}
USER manila USER manila

3
tests/test_build.py
View File

@ -47,8 +47,7 @@ class BuildTest(base.BaseTestCase):
"murano-base", "murano-base",
"ironic-pxe", "ironic-pxe",
"ironic-discoverd", "ironic-discoverd",
"mistral-base", "mistral-base"]
"manila-base"]
failures = 0 failures = 0
for image, result in six.iteritems(bad_results): for image, result in six.iteritems(bad_results):