Add OVS 2.4.0

Signed-off-by: Dave Tucker <dave@dtucker.co.uk>

2.3.0/Dockerfile → 2.4.0/Dockerfile

@@ -1,6 +1,6 @@
 FROM socketplane/busybox:latest
-MAINTAINER Dave Tucker <dave@socketplane.io>
-ENV OVS_VERSION 2.3
+MAINTAINER The SocketPlane Team <support@socketplane.io>
+ENV OVS_VERSION 2.4.0
 ENV SUPERVISOR_STDOUT_VERSION 0.1.1
 # Configure supervisord
 RUN mkdir -p /var/log/supervisor/
@@ -23,6 +23,9 @@ RUN wget https://s3-us-west-2.amazonaws.com/docker-ovs/openvswitch-$OVS_VERSION.
 	cp -r openvswitch/* / &&\
 	rm -r openvswitch &&\
 	rm openvswitch-$OVS_VERSION.tar.gz 
+ADD configure-ovs.sh /usr/local/share/openvswitch/
+# Create the database
 RUN ovsdb-tool create /etc/openvswitch/conf.db /usr/local/share/openvswitch/vswitch.ovsschema
-# Start OVS processes using supervisor
-CMD "/usr/bin/supervisord"
+# Put the OVS Python modules on the Python Path
+RUN cp -r /usr/local/share/openvswitch/python/ovs /usr/lib/python2.7/site-packages/ovs
+CMD ["/usr/bin/supervisord"]

2.4.0/configure-ovs.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+ovs_version=$(ovs-vsctl -V | grep ovs-vsctl | awk '{print $4}')
+ovs_db_version=$(ovsdb-tool schema-version /usr/local/share/openvswitch/vswitch.ovsschema)
+
+# give ovsdb-server and vswitchd some space...
+sleep 3
+# begin configuring
+ovs-vsctl --no-wait -- init
+ovs-vsctl --no-wait -- set Open_vSwitch . db-version="${ovs_db_version}"
+ovs-vsctl --no-wait -- set Open_vSwitch . ovs-version="${ovs_version}"
+ovs-vsctl --no-wait -- set Open_vSwitch . system-type="docker-ovs"
+ovs-vsctl --no-wait -- set Open_vSwitch . system-version="0.1"
+ovs-vsctl --no-wait -- set Open_vSwitch . external-ids:system-id=`cat /proc/sys/kernel/random/uuid`
+ovs-vsctl --no-wait -- set-manager ptcp:6640
+ovs-appctl -t ovsdb-server ovsdb-server/add-remote db:Open_vSwitch,Open_vSwitch,manager_options
+

2.4.0/supervisord.conf

@@ -0,0 +1,64 @@
+[unix_http_server]
+file = /var/run/supervisor.sock
+
+[inet_http_server]
+port = 9001
+
+[supervisord]
+nodaemon=true
+logfile = /var/log/supervisor/supervisord.log
+logfile_maxbytes = 200KB
+logfile_backups = 1
+pidfile = /var/run/supervisord.pid
+childlogdir = /var/log/supervisor
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl = unix:///var/run/supervisor.sock
+
+[program:ovsdb-server]
+command=/usr/local/sbin/ovsdb-server /etc/openvswitch/conf.db --remote=punix:/usr/local/var/run/openvswitch/db.sock --remote=ptcp:6640 --pidfile=ovsdb-server.pid
+priority=10
+startsec=10
+stderr_events_enabled=true
+stdout_events_enabled=true
+
+[program:ovs-vswitchd]
+command=/usr/local/sbin/ovs-vswitchd -v --pidfile
+priority=20
+startsec=10
+stderr_events_enabled=true
+stdout_events_enabled=true
+
+[program:ovsdb-server-vtep]
+command=/usr/local/sbin/ovsdb-server /etc/openvswitch/conf.db /etc/openvswitch/vtep.db --remote=punix:/var/run/openvswitch/db.sock --pidfile=ovsdb-server.pid
+autostart=false
+priority=10
+startsec=10
+stderr_events_enabled=true
+stdout_events_enabled=true
+
+[program:ovs-vtep]
+command=/usr/local/share/openvswitch/scripts/ovs-vtep --pidfile=/var/run/openvswitch/ovs-vtep.pid br-vtep
+autostart=false
+priority=30
+startsec=10
+stderr_events_enabled=true
+stdout_events_enabled=true
+
+[program:configure-ovs]
+command=/usr/local/share/openvswitch/configure-ovs.sh
+priority=30
+startsecs=0
+exitcodes=0
+autorestart=false
+stderr_events_enabled=true
+stdout_events_enabled=true
+
+[eventlistener:stdout]
+command = supervisor_stdout
+buffer_size = 100
+events = PROCESS_LOG
+result_handler = supervisor_stdout:event_handler

Dockerfile

@@ -1,6 +1,6 @@
 FROM socketplane/busybox:latest
 MAINTAINER The SocketPlane Team <support@socketplane.io>
-ENV OVS_VERSION 2.3.2
+ENV OVS_VERSION 2.4.0
 ENV SUPERVISOR_STDOUT_VERSION 0.1.1
 # Configure supervisord
 RUN mkdir -p /var/log/supervisor/

Makefile

@@ -28,7 +28,8 @@ OVS_VERSIONS = \
 	"2.1.3" \
 	"2.3" \
 	"2.3.1" \
-	"2.3.2"
+	"2.3.2" \
+	"2.4.0"
 
 all: reconfigure build
 

latest

@@ -1 +1 @@
-2.3.2
+2.4.0