openstack/kolla-ansible
Code Issues Proposed changes

Merge "Install openvswitch-switch in manila"

Browse Source
This commit is contained in:
Jenkins 2016-03-14 23:43:35 +00:00 committed by Gerrit Code Review
commit 302b030216
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,11 +4,32 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install openstack-manila \
RUN yum -y install \
openstack-manila \
openvswitch \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
RUN apt-get install -y --no-install-recommends \
openvswitch-switch \
&& apt-get clean
{% endif %}
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \
openvswitch \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN apt-get install -y --no-install-recommends \
openvswitch-switch \
&& apt-get clean
{% endif %}
ADD manila-base-archive /manila-base-source
RUN ln -s manila-base-source/* manila \