easzlab
/
kubeasz
mirror of https://github.com/easzlab/kubeasz.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

为 easzctl 增加 ${@:3} 队列变量 

以支持在 hosts 为 node 增加更多主机变量
pull/771/head
tangx 2019-12-01 17:33:27 +08:00 committed by jmgao
parent a54f6f55c0
commit d41cef4656
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/easzctl
View File

@ -79,7 +79,7 @@ function add-node() {
sed -n '/^\[kube-master/,/^\[harbor/p' $BASEPATH/hosts|grep "^$1[^0-9]*$" && { echo "[ERROR] node $1 already existed!"; return 2; } sed -n '/^\[kube-master/,/^\[harbor/p' $BASEPATH/hosts|grep "^$1[^0-9]*$" && { echo "[ERROR] node $1 already existed!"; return 2; }
# add a node into 'kube-node' group # add a node into 'kube-node' group
sed -i "/\[kube-node/a $1 NEW_NODE=yes" $BASEPATH/hosts sed -i "/\[kube-node/a $1 NEW_NODE=yes ${@:2}" $BASEPATH/hosts
# check if playbook runs successfully # check if playbook runs successfully
ansible-playbook $BASEPATH/tools/02.addnode.yml -e NODE_TO_ADD=$1 || { sed -i "/$1 NEW_NODE=yes/d" $BASEPATH/hosts; return 2; } ansible-playbook $BASEPATH/tools/02.addnode.yml -e NODE_TO_ADD=$1 || { sed -i "/$1 NEW_NODE=yes/d" $BASEPATH/hosts; return 2; }
@ -97,7 +97,7 @@ function add-master() {
sed -n '/^\[kube-master/,/^\[kube-node/p' $BASEPATH/hosts|grep "^$1[^0-9]*$" && { echo "[ERROR] master $1 already existed!"; return 2; } sed -n '/^\[kube-master/,/^\[kube-node/p' $BASEPATH/hosts|grep "^$1[^0-9]*$" && { echo "[ERROR] master $1 already existed!"; return 2; }
# add a node into 'kube-master' group # add a node into 'kube-master' group
sed -i "/\[kube-master/a $1 NEW_MASTER=yes" $BASEPATH/hosts sed -i "/\[kube-master/a $1 NEW_MASTER=yes ${@:2}" $BASEPATH/hosts
# check if playbook runs successfully # check if playbook runs successfully
ansible-playbook $BASEPATH/tools/03.addmaster.yml -e NODE_TO_ADD=$1 || { sed -i "/$1 NEW_MASTER=yes/d" $BASEPATH/hosts; return 2; } ansible-playbook $BASEPATH/tools/03.addmaster.yml -e NODE_TO_ADD=$1 || { sed -i "/$1 NEW_MASTER=yes/d" $BASEPATH/hosts; return 2; }
@ -419,12 +419,12 @@ case "$1" in
(add-master) (add-master)
[ "$#" -gt 1 ] || { usage >&2; exit 2; } [ "$#" -gt 1 ] || { usage >&2; exit 2; }
ACTION="Action: add a k8s master node" ACTION="Action: add a k8s master node"
CMD="add-master $2" CMD="add-master $2 ${@:3}"
;; ;;
(add-node) (add-node)
[ "$#" -gt 1 ] || { usage >&2; exit 2; } [ "$#" -gt 1 ] || { usage >&2; exit 2; }
ACTION="Action: add a k8s work node" ACTION="Action: add a k8s work node"
CMD="add-node $2" CMD="add-node $2 ${@:3}"
;; ;;
(del-etcd) (del-etcd)
[ "$#" -gt 1 ] || { usage >&2; exit 2; } [ "$#" -gt 1 ] || { usage >&2; exit 2; }