修复easzctl setup流程

cdx7779 · Mar 17, 2019 · ef0ed89 · ef0ed89
1 parent 27ff0e6
commit ef0ed89
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/roles/kube-node/tasks/main.yml b/roles/kube-node/tasks/main.yml
@@ -37,6 +37,7 @@
     line: 'source <(kubectl completion bash)'
   connection: local
   run_once: true
+  ignore_errors: true
 
 - name: 分发证书相关
   synchronize: src={{ ca_dir }}/{{ item }} dest={{ ca_dir }}/{{ item }}

diff --git a/tools/easzctl b/tools/easzctl
@@ -236,7 +236,7 @@ function setup() {
     echo -e "\n[INFO] setup cluster with context: $CLUSTER"
     echo -e "[INFO] setup begin in 5s, press 'Enter' to abort\n:"
     ! (read -t 5 ANS) || { echo "[WARN] setup aborted"; return 1; }
-    ansible-playbook $BASEPATH/90.setup.yml
+    ansible-playbook $BASEPATH/90.setup.yml || return 1
     save_context
 }