From 30f62d728ce714acafd2747a6fafeca7e1a8a96a003fdcd03a3a4611ff4c7502 Mon Sep 17 00:00:00 2001
From: Flavio Castelli <fcastelli@suse.com>
Date: Tue, 22 Mar 2016 15:28:46 +0000
Subject: [PATCH] - Changed systemd unit file and default sysconfig file to
 include network options,   this is needed to get SDN like flannel to work

OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=87
---
 docker.changes   | 6 ++++++
 docker.service   | 2 +-
 sysconfig.docker | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/docker.changes b/docker.changes
index 5c5e523..3eee7a4 100644
--- a/docker.changes
+++ b/docker.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar 22 15:27:26 UTC 2016 - fcastelli@suse.com
+
+- Changed systemd unit file and default sysconfig file to include network options,
+  this is needed to get SDN like flannel to work
+
 -------------------------------------------------------------------
 Tue Mar 15 09:16:55 UTC 2016 - asarai@suse.de
 
diff --git a/docker.service b/docker.service
index 6177c84..c2fc918 100644
--- a/docker.service
+++ b/docker.service
@@ -9,7 +9,7 @@ Requires=docker.socket
 # exists and systemd currently does not support the cgroup feature set required
 # for containers run by docker
 EnvironmentFile=/etc/sysconfig/docker
-ExecStart=/usr/bin/docker daemon -H fd:// $DOCKER_OPTS
+ExecStart=/usr/bin/docker daemon -H fd:// $DOCKER_NETWORK_OPTIONS $DOCKER_OPTS
 MountFlags=slave
 LimitNOFILE=1048576
 LimitNPROC=1048576
diff --git a/sysconfig.docker b/sysconfig.docker
index f089e52..5b3b0fb 100644
--- a/sysconfig.docker
+++ b/sysconfig.docker
@@ -6,3 +6,5 @@
 ## ServiceRestart : docker
 #
 DOCKER_OPTS=""
+
+DOCKER_NETWORK_OPTIONS=""