Merge pull request #308 from aLostEngineer/master

Update calico systemd.service template for EL7
2016-06-22 21:12:11 +02:00 · 2016-06-22 21:12:11 +02:00 · d7babeba2e
parent dc90c594c6 9e59c74c24
commit d7babeba2e
1 changed files with 3 additions and 1 deletions
--- a/roles/network_plugin/calico/templates/systemd-docker.service
+++ b/roles/network_plugin/calico/templates/systemd-docker.service
@ -12,6 +12,7 @@ Requires=docker.socket
 [Service]
 Type=notify
 {% if ansible_os_family == "RedHat" %}
+EnvironmentFile=-/etc/default/docker
 EnvironmentFile=-/etc/sysconfig/docker
 EnvironmentFile=-/etc/sysconfig/docker-network
 EnvironmentFile=-/etc/sysconfig/docker-storage
@ -23,7 +24,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