openstack/kolla-ansible
Code Issues Proposed changes

Merge "Manila ubuntu binary container"

Browse Source
This commit is contained in:
Jenkins 2016-03-17 15:45:12 +00:00 committed by Gerrit Code Review
commit bbe08628d0
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/manila/manila-api/Dockerfile.j2
View File

@ -1,6 +1,16 @@
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 ['ubuntu'] %}
RUN apt-get install -y --no-install-recommends \
manila-api \
&& apt-get clean
{% endif%}
{% endif%}
COPY extend_start.sh /usr/local/bin/kolla_manila_extend_start COPY extend_start.sh /usr/local/bin/kolla_manila_extend_start
RUN chmod 755 /usr/local/bin/kolla_manila_extend_start RUN chmod 755 /usr/local/bin/kolla_manila_extend_start

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

@ -12,6 +12,7 @@ RUN yum -y install \
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
RUN apt-get install -y --no-install-recommends \ RUN apt-get install -y --no-install-recommends \
manila-common \
openvswitch-switch \ openvswitch-switch \
&& apt-get clean && apt-get clean

10
docker/manila/manila-scheduler/Dockerfile.j2
View File

@ -1,6 +1,16 @@
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 ['ubuntu'] %}
RUN apt-get install -y --no-install-recommends \
manila-scheduler \
&& apt-get clean
{% endif%}
{% endif%}
{{ include_footer }} {{ include_footer }}
USER manila USER manila