From 0067afe12fe3b1d8bd93882a0070e1d988b744a3 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Thu, 12 Oct 2017 21:46:01 +0000
Subject: [PATCH] restart docker service on iptables reloads, and set docker to
 not restart containers on service restarts

---
 roles/base/handlers/main.yml                           | 3 +++
 roles/base/tasks/main.yml                              | 1 +
 roles/mirrormanager/mirrorlist_proxy/files/daemon.json | 3 +++
 roles/mirrormanager/mirrorlist_proxy/tasks/main.yml    | 5 +++++
 4 files changed, 12 insertions(+)
 create mode 100644 roles/mirrormanager/mirrorlist_proxy/files/daemon.json

diff --git a/roles/base/handlers/main.yml b/roles/base/handlers/main.yml
index bf3b26f2c0..002359e476 100644
--- a/roles/base/handlers/main.yml
+++ b/roles/base/handlers/main.yml
@@ -9,6 +9,9 @@
 - name: restart iptables
   service: name=iptables state=restarted
 
+- name: restart docker
+  command: systemctl try-restart docker
+
 - name: restart ip6tables
   service: name=ip6tables state=restarted
 
diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index c8a8ba0c13..057dd84417 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -196,6 +196,7 @@
   notify:
   - restart iptables
   - reload libvirtd
+  - restart docker
   tags:
   - iptables
   - config
diff --git a/roles/mirrormanager/mirrorlist_proxy/files/daemon.json b/roles/mirrormanager/mirrorlist_proxy/files/daemon.json
new file mode 100644
index 0000000000..c0bd95ba72
--- /dev/null
+++ b/roles/mirrormanager/mirrorlist_proxy/files/daemon.json
@@ -0,0 +1,3 @@
+{
+"live-restore": true
+}
diff --git a/roles/mirrormanager/mirrorlist_proxy/tasks/main.yml b/roles/mirrormanager/mirrorlist_proxy/tasks/main.yml
index 37c45a0e52..67f18e87d2 100644
--- a/roles/mirrormanager/mirrorlist_proxy/tasks/main.yml
+++ b/roles/mirrormanager/mirrorlist_proxy/tasks/main.yml
@@ -54,6 +54,11 @@
   tags:
   - mirrorlist_proxy
 
+- name: setup daemon.json to not restart containers on docker service restarts
+  copy: src=daemon.json dest=/etc/docker/daemon.json
+  tags:
+  - mirrorlist_proxy
+
 - name: Run docker
   service: name=docker state=started enabled=yes
   tags: