diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-17 20:53:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-17 20:53:07 +0000 |
| commit | be47d1cbf230988b4c9771ed84381a68ed734c58 (patch) | |
| tree | b1a69e7abe935fd9099e2048e8a13fc07a58a47d | |
| parent | 0b243615279e8fabe831e279989334986a3f4a27 (diff) | |
| parent | bcd9f2c23d25fc979613e9923d7af21a244dd12c (diff) | |
| download | kolla-be47d1cbf230988b4c9771ed84381a68ed734c58.tar.gz kolla-be47d1cbf230988b4c9771ed84381a68ed734c58.zip | |
Merge "Make openvswitch build from source"
| -rw-r--r-- | docker_templates/openvswitch/ovs-base/Dockerfile.j2 | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/docker_templates/openvswitch/ovs-base/Dockerfile.j2 b/docker_templates/openvswitch/ovs-base/Dockerfile.j2 index e4da1ac49..f1e00e5d0 100644 --- a/docker_templates/openvswitch/ovs-base/Dockerfile.j2 +++ b/docker_templates/openvswitch/ovs-base/Dockerfile.j2 @@ -3,7 +3,14 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) {% 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 {% elif base_distro in ['ubuntu', 'debian'] %} |