openstack/kolla-ansible
Code Issues Proposed changes

Merge "Make openvswitch build from source"

Browse Source
This commit is contained in:
Jenkins 2015-08-17 20:53:07 +00:00 committed by Gerrit Code Review
commit be47d1cbf2
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker_templates/openvswitch/ovs-base/Dockerfile.j2
View File

@ -3,7 +3,14 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
RUN yum install -y openvswitch \ # TODO(sdake): groan openvswitch is only in the RDO repos
{% if install_type == 'source' %}
RUN yum install -y https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo.rpm \
&& yum clean all
{% endif %}
RUN yum install -y \
openvswitch \
&& yum clean all && yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %} {% elif base_distro in ['ubuntu', 'debian'] %}