Disk config (#1450)

* add daemon config temp

* change config

* remove old daemon json

deployment/k8sPaiLibrary/maintainconf/add.yaml

@@ -30,6 +30,10 @@ add-worker-node:
       src: deployment/k8sPaiLibrary/template/config.template
       dst: add-worker-node/etc/kubernetes
 
+    - name: docker-daemon.json
+      src: deployment/k8sPaiLibrary/template/docker-daemon.json.template
+      dst: add-worker-node
+
 
     # List of the file
     file-list:
@@ -48,10 +52,6 @@ add-worker-node:
       src: deployment/k8sPaiLibrary/maintaintool/kubelet-start.sh
       dst: add-worker-node
 
-    - name: docker-daemon.json
-      src: deployment/k8sPaiLibrary/maintaintool/docker-daemon.json
-      dst: add-worker-node
-
     - name: docker-config-update.py
       src: deployment/k8sPaiLibrary/maintaintool/docker-config-update.py
       dst: add-worker-node
@@ -99,6 +99,10 @@ add-master-node-task-two:
       src: deployment/k8sPaiLibrary/template/config.template
       dst: add-master-node-task-two/etc/kubernetes
 
+    - name: docker-daemon.json
+      src: deployment/k8sPaiLibrary/template/docker-daemon.json.template
+      dst: add-master-node-task-two
+
 
     file-list:
     - name: docker-ce-install.sh
@@ -113,10 +117,6 @@ add-master-node-task-two:
       src: deployment/k8sPaiLibrary/maintaintool/kubelet-start.sh
       dst: add-master-node-task-two
 
-    - name: docker-daemon.json
-      src: deployment/k8sPaiLibrary/maintaintool/docker-daemon.json
-      dst: add-master-node-task-two
-
     - name: docker-config-update.py
       src: deployment/k8sPaiLibrary/maintaintool/docker-config-update.py
       dst: add-master-node-task-two

deployment/k8sPaiLibrary/maintainconf/deploy.yaml

@@ -43,6 +43,10 @@ master-deployment:
       src: deployment/k8sPaiLibrary/template/config.template
       dst: master-deployment/etc/kubernetes
 
+    - name: docker-daemon.json
+      src: deployment/k8sPaiLibrary/template/docker-daemon.json.template
+      dst: master-deployment
+
 
     file-list:
     - name: docker-ce-install.sh
@@ -57,10 +61,6 @@ master-deployment:
       src: deployment/k8sPaiLibrary/maintaintool/kubelet-start.sh
       dst: master-deployment
 
-    - name: docker-daemon.json
-      src: deployment/k8sPaiLibrary/maintaintool/docker-daemon.json
-      dst: master-deployment
-
     - name: docker-config-update.py
       src: deployment/k8sPaiLibrary/maintaintool/docker-config-update.py
       dst: master-deployment
@@ -76,6 +76,10 @@ worker-deployment:
       src: deployment/k8sPaiLibrary/template/config.template
       dst: worker-deployment/etc/kubernetes
 
+    - name: docker-daemon.json
+      src: deployment/k8sPaiLibrary/template/docker-daemon.json.template
+      dst: worker-deployment
+
 
     file-list:
     - name: docker-ce-install.sh
@@ -90,10 +94,6 @@ worker-deployment:
       src: deployment/k8sPaiLibrary/maintaintool/kubelet-start.sh
       dst: worker-deployment
 
-    - name: docker-daemon.json
-      src: deployment/k8sPaiLibrary/maintaintool/docker-daemon.json
-      dst: worker-deployment
-
     - name: docker-config-update.py
       src: deployment/k8sPaiLibrary/maintaintool/docker-config-update.py
       dst: worker-deployment
@@ -117,6 +117,10 @@ proxy-deployment:
       src: deployment/k8sPaiLibrary/template/haproxy.cfg.template
       dst: proxy-deployment/etc/kubernetes/haproxy
 
+    - name: docker-daemon.json
+      src: deployment/k8sPaiLibrary/template/docker-daemon.json.template
+      dst: proxy-deployment
+
 
     file-list:
     - name: docker-ce-install.sh
@@ -131,10 +135,6 @@ proxy-deployment:
       src: deployment/k8sPaiLibrary/maintaintool/kubelet-start.sh
       dst: proxy-deployment
 
-    - name: docker-daemon.json
-      src: deployment/k8sPaiLibrary/maintaintool/docker-daemon.json
-      dst: proxy-deployment
-
     - name: docker-config-update.py
       src: deployment/k8sPaiLibrary/maintaintool/docker-config-update.py
       dst: proxy-deployment

deployment/k8sPaiLibrary/template/docker-daemon.json.template

@@ -3,5 +3,6 @@
   "log-opts": {
     "max-size": "100m",
     "max-file": "10"
-  }
-}
+  },
+  "data-root": "{{ hostcofig["docker-data"] }}"
+}

deployment/quick-start/cluster-configuration.yaml.template

@@ -50,5 +50,6 @@ machine-list:
   {%- endif %}
   {%- if loop.length == 1 %}
     pai-worker: "true"
+    docker-data: /var/lib/docker
   {%- endif %}
 {%- endfor %}

docs/job_log.md

@@ -151,7 +151,7 @@ If the Framework retried many times, check other attempts by searching the Frame
 
 #### Note:
 - History job number limit: Currently, OpenPAI's yarn only store 1000 jobs' logs. User maybe can not find some old job's logs. For example, frequently retried job logs.
-- Job container log rotation: In order to prevent the historical log from being too large, OpenPAI configure the [docker log rotation](https://docs.docker.com/config/containers/logging/json-file/) by file [docker-daemon.json](../deployment/k8sPaiLibrary/maintaintool/docker-daemon.json). 
+- Job container log rotation: In order to prevent the historical log from being too large, OpenPAI configure the [docker log rotation](https://docs.docker.com/config/containers/logging/json-file/) by file [docker-daemon.json](../deployment/k8sPaiLibrary/template/docker-daemon.json.template). 
 	The default configuration:
 	- "max-size": "100m": The maximum size of the log before it is rolled. A positive integer plus a modifier representing the unit of measure (k, m, or g). Defaults to -1 (unlimited)., 
 	- "max-file": "10": The maximum number of log files that can be present. If rolling the logs creates excess files, the oldest file is removed. Only effective when max-size is also set. A positive integer. Defaults to 1.