openstack/kolla-ansible
Code Issues Proposed changes

Install openvswitch-switch in manila

Browse Source 
Change-Id: I8277ad668f46d327807a01ceb96c2abb417f0e3d
Closes-Bug:#1556271
This commit is contained in:
Mauricio Lima 2016-03-11 15:39:23 -05:00
parent d484f40fc8
commit a9edc7e0a0
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 install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install openstack-manila \ RUN yum -y install \
openstack-manila \
openvswitch \
&& yum clean all && yum clean all
{% elif base_distro in ['ubuntu'] %}
RUN apt-get install -y --no-install-recommends \
openvswitch-switch \
&& apt-get clean
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% 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 ADD manila-base-archive /manila-base-source
RUN ln -s manila-base-source/* manila \ RUN ln -s manila-base-source/* manila \