@@ -120,7 +120,11 @@ os::util::get-network-plugin() {

 os::util::install-sdn() {

   local deployed_root=$1

-

+  local target=$2

+  target=${target:-/usr}

+  if [ ! -d ${target} ]; then

+    mkdir -p ${target}

+  fi

   # Source scripts from an openshift-sdn repo if present to support

   # openshift-sdn development.

   local sdn_root="${deployed_root}/third-party/openshift-sdn"

@@ -135,20 +139,21 @@ os::util::install-sdn() {

     local osdn_controller_path="${osdn_base_path}/pkg/ovssubnet/controller"

     pushd "${osdn_controller_path}" > /dev/null

       # The subnet plugin is discovered via the kube network plugin path.

-      local kube_osdn_path="/usr/libexec/kubernetes/kubelet-plugins/net/exec/redhat~openshift-ovs-subnet"

+      local kube_osdn_path="${target}/libexec/kubernetes/kubelet-plugins/net/exec/redhat~openshift-ovs-subnet"

       mkdir -p "${kube_osdn_path}"

+      mkdir -p "${target}/bin/"

       cp -f kube/bin/openshift-ovs-subnet "${kube_osdn_path}/"

-      cp -f kube/bin/openshift-sdn-kube-subnet-setup.sh /usr/bin/

+      cp -f kube/bin/openshift-sdn-kube-subnet-setup.sh "${target}/bin/"

       # The multitenant plugin only needs to be in PATH because the

       # origin multitenant plugin knows how to discover it.

-      cp -f multitenant/bin/openshift-ovs-multitenant /usr/bin/

-      cp -f multitenant/bin/openshift-sdn-multitenant-setup.sh /usr/bin/

+      cp -f multitenant/bin/openshift-ovs-multitenant "${target}/bin/"

+      cp -f multitenant/bin/openshift-sdn-multitenant-setup.sh "${target}/bin/"

       # subnet and multitenant plugin setup writes docker network options

       # to /run/openshift-sdn/docker-network, make this file to be exported

       # as part of docker service start.

-      local system_docker_path="/usr/lib/systemd/system/docker.service.d/"

+      local system_docker_path="${target}/lib/systemd/system/docker.service.d/"

       mkdir -p "${system_docker_path}"

       cat <<EOF > "${system_docker_path}/docker-sdn-ovs.conf"

 [Service]

@@ -15,6 +15,7 @@ STARTTIME=$(date +%s)

 OS_ROOT=$(dirname "${BASH_SOURCE}")/..

 source "${OS_ROOT}/hack/common.sh"

 source "${OS_ROOT}/hack/util.sh"

+source "${OS_ROOT}/contrib/vagrant/provision-util.sh"

 os::log::install_errexit

 # Go to the top of the tree.

@@ -49,6 +50,11 @@ cp -pf "${imagedir}/deployment"      examples/deployment/bin

 cp -pf "${imagedir}/gitserver"       examples/gitserver/bin

 cp -pf "${imagedir}/dockerregistry"  images/dockerregistry/bin

+# Copy SDN scripts into images/node

+os::util::install-sdn "${OS_ROOT}" "${OS_ROOT}/images/node"

+mkdir -p images/node/conf/

+cp -pf "${OS_ROOT}/contrib/systemd/openshift-sdn-ovs.conf" images/node/conf/

+

 # builds an image and tags it two ways - with latest, and with the release tag

 function image {

   echo "--- $1 ---"

@@ -56,8 +62,9 @@ function image {

   docker tag -f $1:latest $1:${OS_RELEASE_COMMIT}

 }

-# images that depend on scratch

+# images that depend on scratch / centos

 image openshift/origin-pod                   images/pod

+image openshift/openvswitch                  images/openvswitch

 # images that depend on openshift/origin-base

 image openshift/origin                       images/origin

 image openshift/origin-haproxy-router        images/router/haproxy

@@ -69,6 +76,7 @@ image openshift/origin-docker-builder        images/builder/docker/docker-builde

 image openshift/origin-gitserver             examples/gitserver

 image openshift/origin-sti-builder           images/builder/docker/sti-builder

 image openshift/origin-f5-router             images/router/f5

+image openshift/node                         images/node

 # unpublished images

 image openshift/origin-custom-docker-builder images/builder/docker/custom-docker-builder

new file mode 100644

@@ -0,0 +1,4 @@

+bin/

+lib/

+libexec/

+conf/

new file mode 100644

@@ -0,0 +1,42 @@

+#

+# This is an OpenShift Origin node image with integrated OpenvSwitch SDN

+# If you do not require OVS SDN you should just use the origin image

+#

+# The standard name for this image is openshift/origin-node

+#

+

+FROM openshift/origin

+

+# Based on work by: Peter Schiffer <pschiffe@redhat.com>

+MAINTAINER Devan Goodwin <dgoodwin@redhat.com>

+

+# We need to install openvswitch for the client portions, the daemons are expected

+# to run in another container

+

+ADD https://copr.fedoraproject.org/coprs/maxamillion/origin-next/repo/epel-7/maxamillion-origin-next-epel-7.repo /etc/yum.repos.d/

+RUN yum install -y libmnl libnetfilter_conntrack openvswitch \

+    libnfnetlink iptables iproute bridge-utils procps-ng ethtool socat openssl \

+    binutils xz kmod-libs kmod sysvinit-tools device-mapper-libs dbus \

+    && yum clean all

+

+RUN mkdir -p /usr/libexec/kubernetes/kubelet-plugins/net/exec/redhat~openshift-ovs-subnet \

+    /usr/lib/systemd/system/origin-node.service.d \

+    /usr/lib/systemd/system/docker.service.d

+

+# All of the following are placed in images/node by hack/build-images.sh

+# They won't exist in the git checkout

+ADD bin/* /usr/bin/

+ADD libexec/kubernetes/kubelet-plugins/net/exec/redhat~openshift-ovs-subnet/openshift-ovs-subnet /usr/libexec/kubernetes/kubelet-plugins/net/exec/redhat~openshift-ovs-subnet/

+ADD conf/openshift-sdn-ovs.conf /usr/lib/systemd/system/origin-node.service.d/

+ADD lib/systemd/system/docker.service.d/docker-sdn-ovs.conf /usr/lib/systemd/system/docker.service.d/docker-sdn-ovs.conf

+ADD scripts/* /usr/local/bin/

+RUN chmod +x /usr/local/bin/* /usr/bin/openshift-* /usr/libexec/kubernetes/kubelet-plugins/net/exec/redhat~openshift-ovs-subnet/openshift-ovs-subnet

+

+VOLUME [ "/etc/origin/node", "/var/lib/origin" ]

+WORKDIR /var/lib/origin

+

+ENV HOME /root

+ENV OPENSHIFT_CONTAINERIZED true

+ENV KUBECONFIG /etc/origin/node/node.kubeconfig

+ENTRYPOINT []

+CMD [ "/usr/local/bin/origin-node-run.sh" ]

new file mode 100644

@@ -0,0 +1,19 @@

+#!/bin/sh

+

+set -eu

+

+function quit {

+    pkill openshift

+    exit 0

+}

+

+trap quit SIGTERM

+

+if [ ! -f ${HOST_ETC}/systemd/system/docker.service.d/docker-sdn-ovs.conf ]; then

+    mkdir -p ${HOST_ETC}/systemd/system/docker.service.d

+    cp /usr/lib/systemd/system/docker.service.d/docker-sdn-ovs.conf ${HOST_ETC}/systemd/system/docker.service.d

+fi

+

+/usr/bin/openshift start node --config=${CONFIG_FILE} ${OPTIONS}

+

+while true; do sleep 5; done

new file mode 100644

@@ -0,0 +1,21 @@

+#

+# This is an openvswitch image meant to enable OpenShift OVS based SDN

+#

+# The standard name for this image is openshift/openvswitch

+#

+

+FROM centos:centos7

+

+MAINTAINER Scott Dodson <sdodson@redhat.com>

+

+ADD https://copr.fedoraproject.org/coprs/maxamillion/origin-next/repo/epel-7/maxamillion-origin-next-epel-7.repo /etc/yum.repos.d/

+# TODO: figure out which of these are necessary for openvswitch, this is the list of packages needed for ovs + node

+RUN yum install -y openvswitch \

+    && yum clean all

+

+ADD  scripts/* /usr/local/bin/

+RUN chmod +x /usr/local/bin/*

+VOLUME [ "/etc/openswitch" ]

+

+ENV HOME /root

+ENTRYPOINT [ "/usr/local/bin/ovs-run.sh" ]

new file mode 100644

@@ -0,0 +1,15 @@

+#!/bin/sh

+

+set -eu

+

+function quit {

+    /usr/share/openvswitch/scripts/ovs-ctl stop

+    exit 0

+}

+

+trap quit SIGTERM

+

+/usr/share/openvswitch/scripts/ovs-ctl start --system-id=random

+

+while true; do sleep 5; done

+