minor fix

Author: gjmzj

example/hosts.allinone

@@ -45,12 +45,6 @@ NODE_PORT_RANGE="20000-40000"
 # Cluster DNS Domain
 CLUSTER_DNS_DOMAIN="cluster.local."
 
-# Docker data ROOT
-# STORAGE_DIR="/var/lib/docker"
-
-# Docker insecure registry
-# INSECURE_REG='["127.0.0.1/8"]'
-
 # -------- Additional Variables (don't change the default value right now)---
 # Binaries Directory
 bin_dir="/opt/kube/bin"

example/hosts.multi-node

@@ -49,12 +49,6 @@ NODE_PORT_RANGE="20000-40000"
 # Cluster DNS Domain
 CLUSTER_DNS_DOMAIN="cluster.local."
 
-# Docker data ROOT
-# STORAGE_DIR="/var/lib/docker"
-
-# Docker insecure registry
-# INSECURE_REG='["127.0.0.1/8"]'
-
 # -------- Additional Variables (don't change the default value right now) ---
 # Binaries Directory
 bin_dir="/opt/kube/bin"

tools/02.addnode.yml

@@ -16,18 +16,22 @@
   tasks:
   - name: 创建文件夹/opt/kube/images
     file: dest=/opt/kube/images state=directory
-  - name: 推送07.cluster-addon.yml中的镜像包
+
+  - name: 推送cluster-addon的离线镜像包
     copy: src={{ item }} dest=/opt/kube/images/
     with_fileglob:
     - "{{ base_dir }}/down/coredns*.tar"
     - "{{ base_dir }}/down/dashboard*.tar"
     - "{{ base_dir }}/down/heapster*.tar"
     - "{{ base_dir }}/down/metrics*.tar"
     - "{{ base_dir }}/down/traefik*.tar"
+    ignore_errors: true
+
   - name: 导入离线镜像（若执行失败，可忽略）
     shell: ls /opt/kube/images/*.tar |while read n;do {{ bin_dir }}/docker load -i $n ;done
     ignore_errors: true
     when: "CONTAINER_RUNTIME == 'docker'"
+
   - name: 导入离线镜像（若执行失败，可忽略）
     shell: ls /opt/kube/images/*.tar |while read n;do {{ bin_dir }}/ctr -n=k8s.io images import $n ;done
     ignore_errors: true