From 18404db076fa79aa635a564d4d2af3fe2649699e Mon Sep 17 00:00:00 2001
From: Josh Lothian <jlothian@cisco.com>
Date: Tue, 21 Mar 2017 15:20:31 -0500
Subject: [PATCH] 1169 - fix docker systemd unit

The docker-network environment file masks the new values
put into /etc/systemd/system/docker.service.d/flannel-options.conf
to renumber the docker0 to work correctly with flannel.
---
 roles/docker/templates/docker_atomic.service.j2 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/roles/docker/templates/docker_atomic.service.j2 b/roles/docker/templates/docker_atomic.service.j2
index ba37bf4c3..0502820a0 100644
--- a/roles/docker/templates/docker_atomic.service.j2
+++ b/roles/docker/templates/docker_atomic.service.j2
@@ -9,7 +9,6 @@ Type=notify
 NotifyAccess=all
 EnvironmentFile=-/etc/sysconfig/docker
 EnvironmentFile=-/etc/sysconfig/docker-storage
-EnvironmentFile=-/etc/sysconfig/docker-network
 Environment=GOTRACEBACK=crash
 Environment=DOCKER_HTTP_HOST_COMPAT=1
 Environment=PATH=/usr/libexec/docker:/usr/bin:/usr/sbin
@@ -35,4 +34,4 @@ TimeoutStartSec=1min
 Restart=on-abnormal
 
 [Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target