diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-18 20:10:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-18 20:10:24 +0000 |
| commit | b0cd947c7ae5222e49aa13ff12851fb9b817efe7 (patch) | |
| tree | 897171af517b03c751112872942871b10f0b34d5 /docker/openvswitch | |
| parent | 4b107aff5f46976ef1d5ba8ffd387e8f25091c55 (diff) | |
| parent | aec595f7f71b4353a7ca577979606eb8779c958f (diff) | |
| download | kolla-b0cd947c7ae5222e49aa13ff12851fb9b817efe7.tar.gz kolla-b0cd947c7ae5222e49aa13ff12851fb9b817efe7.zip | |
Merge "Fix broken centos-source- build: add rdo repository"
Diffstat (limited to 'docker/openvswitch')
| -rw-r--r-- | docker/openvswitch/ovs-base/Dockerfile.j2 | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/docker/openvswitch/ovs-base/Dockerfile.j2 b/docker/openvswitch/ovs-base/Dockerfile.j2 index 4958297c0..05e5b1892 100644 --- a/docker/openvswitch/ovs-base/Dockerfile.j2 +++ b/docker/openvswitch/ovs-base/Dockerfile.j2 @@ -2,13 +2,6 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - {% if install_type == 'source' %} - - # TODO(sdake): groan openvswitch is only in the RDO repos -RUN yum install -y https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo.rpm \ - && yum clean all - - {% endif %} RUN yum install -y \ openvswitch \ |