From d94253ff6a577d4cceb50f2ca9029e3ebfeee61d Mon Sep 17 00:00:00 2001
From: Chris Bell <aLostEngineer@users.noreply.github.com>
Date: Wed, 22 Jun 2016 09:44:31 -0400
Subject: [PATCH] Modify calico docker.service
---
.../calico/templates/systemd-docker.service | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/roles/network_plugin/calico/templates/systemd-docker.service b/roles/network_plugin/calico/templates/systemd-docker.service
index 43b49618f..3d019c7a3 100644
--- a/roles/network_plugin/calico/templates/systemd-docker.service
+++ b/roles/network_plugin/calico/templates/systemd-docker.service
@@ -12,9 +12,9 @@ Requires=docker.socket
[Service]
Type=notify
{% if ansible_os_family == "RedHat" %}
-EnvironmentFile=-/etc/sysconfig/docker
-EnvironmentFile=-/etc/sysconfig/docker-network
-EnvironmentFile=-/etc/sysconfig/docker-storage
+EnvironmentFile=-/etc/default/docker
+EnvironmentFile=-/etc/default/docker-network
+EnvironmentFile=-/etc/docker/docker-storage
{% elif ansible_os_family == "Debian" %}
EnvironmentFile=-/etc/default/docker
{% endif %}
@@ -23,7 +23,8 @@ ExecStart=/usr/bin/docker daemon \
$OPTIONS \
$DOCKER_STORAGE_OPTIONS \
$DOCKER_NETWORK_OPTIONS \
- $INSECURE_REGISTRY
+ $INSECURE_REGISTRY \
+ $DOCKER_OPTS
LimitNOFILE=1048576
LimitNPROC=1048576
LimitCORE=infinity
--
GitLab