From f2a75c6d39773731656e3ad6599b3f710817f289 Mon Sep 17 00:00:00 2001
From: gjmzj <gaojianming.zj@139.com>
Date: Sun, 12 Aug 2018 16:47:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0docker=20=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 roles/docker/defaults/main.yml        | 11 +++++++++++
 roles/docker/files/daemon.json        | 10 ----------
 roles/docker/tasks/main.yml           |  2 +-
 roles/docker/templates/daemon.json.j2 | 10 ++++++++++
 tools/init_vars.yml                   |  2 ++
 5 files changed, 24 insertions(+), 11 deletions(-)
 create mode 100644 roles/docker/defaults/main.yml
 delete mode 100644 roles/docker/files/daemon.json
 create mode 100644 roles/docker/templates/daemon.json.j2

diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml
new file mode 100644
index 0000000..73d1ad2
--- /dev/null
+++ b/roles/docker/defaults/main.yml
@@ -0,0 +1,11 @@
+# 国内镜像加速
+
+REG_MIRROR_1: "https://registry.docker-cn.com"
+REG_MIRROR_2: "https://docker.mirrors.ustc.edu.cn"
+
+# docker日志相关
+
+LOG_DRIVER: "json-file"
+LOG_LEVEL: "warn"
+LOG_MAX_SIZE: "10m"
+LOG_MAX_FILE: 3
diff --git a/roles/docker/files/daemon.json b/roles/docker/files/daemon.json
deleted file mode 100644
index 3862822..0000000
--- a/roles/docker/files/daemon.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "registry-mirrors": ["https://kuamavit.mirror.aliyuncs.com", "https://registry.docker-cn.com", "https://docker.mirrors.ustc.edu.cn"], 
-  "max-concurrent-downloads": 10,
-  "log-driver": "json-file",
-  "log-level": "warn",
-  "log-opts": {
-    "max-size": "10m",
-    "max-file": "3"
-    }
-}
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 43a9d0a..f5ffc11 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -22,7 +22,7 @@
   copy: src=docker dest=/etc/bash_completion.d/docker mode=0644
 
 - name: docker国内镜像加速
-  copy: src=daemon.json dest=/etc/docker/daemon.json
+  template: src=daemon.json.j2 dest=/etc/docker/daemon.json
 
 - name: flush-iptables
   shell: "iptables -F && iptables -X \
diff --git a/roles/docker/templates/daemon.json.j2 b/roles/docker/templates/daemon.json.j2
new file mode 100644
index 0000000..d30d72a
--- /dev/null
+++ b/roles/docker/templates/daemon.json.j2
@@ -0,0 +1,10 @@
+{
+  "registry-mirrors": ["{{ REG_MIRROR_1 }}", "{{ REG_MIRROR_2 }}"], 
+  "max-concurrent-downloads": 10,
+  "log-driver": "{{ LOG_DRIVER }}",
+  "log-level": "{{ LOG_LEVEL }}",
+  "log-opts": {
+    "max-size": "{{ LOG_MAX_SIZE }}",
+    "max-file": "{{ LOG_MAX_FILE }}"
+    }
+}
diff --git a/tools/init_vars.yml b/tools/init_vars.yml
index d84e0a1..1b1267a 100644
--- a/tools/init_vars.yml
+++ b/tools/init_vars.yml
@@ -11,6 +11,7 @@
     - cluster-addon
     - cluster-restore
     - cluster-storage
+    - docker 
     - flannel
     - helm
     - kube-node
@@ -28,6 +29,7 @@
     - cluster-addon
     - cluster-restore
     - cluster-storage
+    - docker 
     - flannel
     - helm
     - kube-node