openstack/kolla
Code Issues Proposed changes

Merge "Customizations for Manila"

Browse Source
This commit is contained in:
Jenkins 2016-08-18 15:43:09 +00:00 committed by Gerrit Code Review
commit ae17562c8e
4 changed files with 47 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,12 +1,16 @@
FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }}
MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_distro in ['ubuntu'] %}
RUN apt-get -y install --no-install-recommends \
manila-api \
&& apt-get clean
{% set manila_api_packages = [
'manila-api'
] %}
RUN {{ macros.install_packages(manila_api_packages | customizable("packages")) }}
{% endif%}
{% endif%}
@ -14,6 +18,8 @@ RUN apt-get -y install --no-install-recommends \
COPY extend_start.sh /usr/local/bin/kolla_manila_extend_start
RUN chmod 755 /usr/local/bin/kolla_manila_extend_start
{% block manila_api_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }}
USER manila

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

@ -1,37 +1,40 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \
openstack-manila \
openvswitch \
&& yum clean all
{% set manila_base_packages = [
'openstack-manila',
'openvswitch'
] %}
{% elif base_distro in ['ubuntu'] %}
RUN apt-get -y install --no-install-recommends \
manila-common \
openvswitch-switch \
&& apt-get clean
{% set manila_base_packages = [
'manila-common',
'openvswitch-switch'
] %}
{% endif %}
RUN {{ macros.install_packages(manila_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \
openvswitch \
&& yum clean all
{% set manila_base_packages = ['openvswitch'] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN apt-get -y install --no-install-recommends \
openvswitch-switch \
&& apt-get clean
{% set manila_base_packages = ['openvswitch-switch'] %}
{% endif %}
RUN {{ macros.install_packages(manila_base_packages | customizable("packages")) }}
ADD manila-base-archive /manila-base-source
RUN ln -s manila-base-source/* manila \
&& useradd --user-group manila \
@ -53,3 +56,6 @@ RUN touch /usr/local/bin/kolla_manila_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_manila_extend_start
RUN usermod -a -G kolla manila
{% block manila_base_footer %}{% endblock %}
{% block footer %}{% endblock %}

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

@ -1,16 +1,22 @@
FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }}
MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_distro in ['ubuntu'] %}
RUN apt-get -y install --no-install-recommends \
manila-scheduler \
&& apt-get clean
{% set manila_scheduler_packages = [
'manila-scheduler'
] %}
RUN {{ macros.install_packages(manila_scheduler_packages | customizable("packages")) }}
{% endif%}
{% endif%}
{% block manila_scheduler_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }}
USER manila

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

@ -1,16 +1,22 @@
FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }}
MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \
openstack-manila-share \
&& yum clean all
{% set manila_share_packages = [
'openstack-manila-share'
] %}
RUN {{ macros.install_packages(manila_share_packages | customizable("packages")) }}
{% endif %}
{% endif %}
{% block manila_share_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }}
USER manila