Skip to content

Commit

Permalink
Install OpenVSwitch from the CentOS PaaS SIG Repos
Browse files Browse the repository at this point in the history
In the past, we were not able to install OpenVSwitch from the normal
CentOS repositories or the `epel-release` repositories as the version
there was too old. We were using Adam Miller's COPR to source a newer
version, however this was unstable and flaky. The CentOS PaaS SIG now
provides the `openshift-origin15` repository which has the dependencies
necessary for bleeding-edge builds of Origin on CentOS, including the
correct OpenVSwitch dependency RPM. We will use this repository from
now on.

Signed-off-by: Steve Kuznetsov <[email protected]>
  • Loading branch information
stevekuznetsov committed Apr 7, 2017
1 parent e935cc6 commit ea38611
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
4 changes: 2 additions & 2 deletions images/node/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
#
FROM openshift/origin

COPY centos-paas-sig-openshift-origin-15.repo /etc/yum.repos.d/
COPY usr/bin/* /usr/bin/
COPY opt/cni/bin/* /opt/cni/bin/
COPY etc/cni/net.d/* /etc/cni/net.d/
COPY conf/openshift-sdn-ovs.conf /usr/lib/systemd/system/origin-node.service.d/
COPY scripts/* /usr/local/bin/

RUN curl -L -o /etc/yum.repos.d/origin-next-epel-7.repo https://copr.fedoraproject.org/coprs/maxamillion/origin-next/repo/epel-7/maxamillion-origin-next-epel-7.repo && \
INSTALL_PKGS="libmnl libnetfilter_conntrack conntrack-tools openvswitch \
RUN INSTALL_PKGS="libmnl libnetfilter_conntrack conntrack-tools openvswitch \
libnfnetlink iptables iproute bridge-utils procps-ng ethtool socat openssl \
binutils xz kmod-libs kmod sysvinit-tools device-mapper-libs dbus \
iscsi-initiator-utils" && \
Expand Down
6 changes: 6 additions & 0 deletions images/node/centos-paas-sig-openshift-origin15.repo
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[centos-paas-sig-openshift-origin15]
name = CentOS PaaS SIG Origin 1.5 Repository
baseurl = https://buildlogs.centos.org/centos/7/paas/x86_64/openshift-origin15/
enabled = 1
gpgcheck = 0
sslverify = 0

0 comments on commit ea38611

Please sign in to comment.