Skip to content

Commit

Permalink
Merge pull request #15542 from andrewklau/ovssdn3.6
Browse files Browse the repository at this point in the history 
Automatic merge from submit-queue

Add back origin-sdn-ovs

From master #15468
  • Loading branch information
@openshift-merge-robot
openshift-merge-robot authored Jul 31, 2017
2 parents f6124b8 + 200055d commit 68c4c59
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions images/node/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ COPY scripts/* /usr/local/bin/
COPY system-container/system-container-wrapper.sh /usr/local/bin/
COPY system-container/manifest.json system-container/config.json.template system-container/service.template system-container/tmpfiles.template /exports/

RUN INSTALL_PKGS="libmnl libnetfilter_conntrack conntrack-tools openvswitch \
RUN INSTALL_PKGS="origin-sdn-ovs 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 bind-utils" && \
yum install -y $INSTALL_PKGS && \
yum --enablerepo=origin-local-release install -y $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
yum clean all && \
mkdir -p /usr/lib/systemd/system/origin-node.service.d /usr/lib/systemd/system/docker.service.d
Expand Down
4 changes: 2 additions & 2 deletions images/node/Dockerfile.centos7
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ COPY scripts/* /usr/local/bin/
COPY system-container/system-container-wrapper.sh /usr/local/bin/
COPY system-container/manifest.json system-container/config.json.template system-container/service.template system-container/tmpfiles.template /exports/

RUN INSTALL_PKGS="libmnl libnetfilter_conntrack conntrack-tools openvswitch \
RUN INSTALL_PKGS="origin-sdn-ovs 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 bind-utils" && \
yum install -y $INSTALL_PKGS && \
yum --enablerepo=origin-local-release install -y $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
yum clean all && \
mkdir -p /usr/lib/systemd/system/origin-node.service.d /usr/lib/systemd/system/docker.service.d
Expand Down

0 comments on commit 68c4c59

Please sign in to comment.