new file mode 100644

@@ -0,0 +1 @@

+Example systemd units for running openshift in a container

new file mode 100644

@@ -0,0 +1,14 @@

+[Unit]

+After=docker.service

+Requires=docker.service

+Before=origin-master.service

+

+[Service]

+EnvironmentFile=/etc/sysconfig/origin-node

+ExecStartPre=-/usr/bin/docker rm -f openvswitch

+ExecStart=/usr/bin/docker run --name openvswitch --rm --privileged --net=host --pid=host -v /lib/modules:/lib/modules -v /run:/run -v /sys:/sys:ro -v /etc/origin/openvswitch:/etc/openvswitch:Z openshift/openvswitch

+ExecStop=/usr/bin/docker stop openvswitch

+Restart=always

+

+[Install]

+WantedBy=multi-user.target

new file mode 100644

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

+[Unit]

+After=docker.service

+Requires=docker.service

+

+

+[Service]

+EnvironmentFile=-/etc/sysconfig/origin-master

+ExecStartPre=-/usr/bin/docker rm -f origin-master

+ExecStart=/usr/bin/docker run --rm --privileged --net=host --name origin-master -v /var/lib/origin:/var/lib/origin:Z -v /var/run/docker.sock:/var/run/docker.sock -v /etc/origin:/etc/origin --entrypoint /usr/bin/openshift openshift/origin start master --config=${CONFIG_FILE} ${OPTIONS}

+ExecStartPost=/usr/bin/sleep 10

+ExecStop=/usr/bin/docker stop origin-master

+Restart=always

+

+[Install]

+WantedBy=multi-user.target

new file mode 100644

@@ -0,0 +1,17 @@

+[Unit]

+After=docker.service

+Requires=docker.service

+Wants=openvswitch.service

+After=origin-master.service

+

+[Service]

+EnvironmentFile=/etc/sysconfig/origin-node

+ExecStartPre=-/usr/bin/docker rm -f origin-node

+ExecStart=/usr/bin/docker run --name origin-node --rm --privileged --net=host --pid=host -v /:/rootfs:ro -e CONFIG_FILE=${CONFIG_FILE} -e OPTIONS=${OPTIONS} -e HOST=/rootfs -v /etc/systemd/system:/host-etc/systemd/system -e HOST_ETC=/host-etc -v /etc/localtime:/etc/localtime:ro -v /etc/machine-id:/etc/machine-id:ro -v /lib/modules:/lib/modules -v /run:/run -v /sys:/sys:ro -v /usr/bin/docker:/usr/bin/docker:ro -v /var/lib/docker:/var/lib/docker -v /etc/origin/node:/etc/origin/node:z -v /etc/origin/openvswitch:/etc/openvswitch:Z -v /etc/origin/sdn:/etc/openshift-sdn:Z -v /var/lib/origin:/var/lib/origin:Z openshift/node

+ExecStartPost=/usr/bin/sleep 10

+ExecStop=/usr/bin/docker stop origin-node

+Restart=always

+TimeoutStartSec=5m

+

+[Install]

+WantedBy=multi-user.target

@@ -2,7 +2,7 @@

 # 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

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

 #

 FROM openshift/origin

@@ -2,6 +2,9 @@

 set -eu

+conf=${CONFIG_FILE:-/etc/origin/node/node-config.yaml}

+opts=${OPTIONS:---loglevel=2}

+

 function quit {

     pkill openshift

     exit 0

@@ -14,6 +17,6 @@ if [ ! -f ${HOST_ETC}/systemd/system/docker.service.d/docker-sdn-ovs.conf ]; the

     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}

+/usr/bin/openshift start node "--config=${conf}" "${opts}"

 while true; do sleep 5; done