Skip to content

Commit

Permalink
Add back origin-sdn-ovs
Browse files Browse the repository at this point in the history
  • Loading branch information
@andrewklau
andrewklau committed Jul 26, 2017
1 parent 2851407 commit fe4f72c
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 \

This comment has been minimized.

Sign in to view

Copy link
@adammhaile

adammhaile Jul 31, 2017

Contributor

@Kargakis removed SDN a few commits back ( 2f7d826#diff-b5321710e6dadcda38c38e45d57c6337L17 )... can you explain the specific reason for adding it back now? This is currently causing our downstream OpenShift builds to fail because this is specifically calling out origin.
Tagging other interested parties: @jupierce @smunilla

This comment has been minimized.

Sign in to view

Copy link
@andrewklau

andrewklau Jul 31, 2017 •
edited
Loading

Author Contributor

@adammhaile When I was building the rpm packages from source, without this ovs-sdn, pods were unable to be created due to "cni config unintialized". Adding ovs-sdn seemed to fix the issue.
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 fe4f72c

Please sign in to comment.