简化新增节点步骤

javaczhang · Jun 10, 2018 · af872c8 · af872c8
1 parent 9f17296
commit af872c8
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 33 deletions.
diff --git a/docs/op/AddMaster.md b/docs/op/AddMaster.md
@@ -13,40 +13,21 @@
 
 ### 操作步骤
 
-按照本项目说明，首先确保deploy节点能够ssh免密码登陆新增节点，然后在**deploy**节点执行三步：
+按照本项目说明，首先确保deploy节点能够ssh免密码登陆新增节点，然后在**deploy**节点执行两步：
 
-- 修改ansible hosts 文件，在 [new-master] 组添加新增的节点；在[lb] 组添加新增master 节点，举例如下：
+- 修改ansible hosts 文件，在 [new-master] 组添加新增的节点，举例如下：
 
 ``` bash
-[lb]
-192.168.1.1 LB_IF="ens3" LB_ROLE=backup
-192.168.1.2 LB_IF="ens3" LB_ROLE=master
-[lb:vars]
-master1="192.168.1.1:6443"
-master2="192.168.1.2:6443"
-master3="192.168.1.5:6443"		# 新增 master节点
 ...
 [new-master]
 192.168.1.5                 	# 新增 master节点
 
 ```
-- 修改roles/lb/templates/haproxy.cfg.j2 文件，增加新增的master节点，举例如下：
-
-``` bash
-listen kube-master
-        bind 0.0.0.0:{{ KUBE_APISERVER.split(':')[2] }}
-        mode tcp
-        option tcplog
-        balance source
-        server s1 {{ master1 }}  check inter 10000 fall 2 rise 2 weight 1
-        server s2 {{ master2 }}  check inter 10000 fall 2 rise 2 weight 1
-        server s3 {{ master3 }}  check inter 10000 fall 2 rise 2 weight 1 # 新增 master节点
-```
 
 - 执行安装脚本
 
 ``` bash
-$ cd /etc/ansible && ansible-playbook 21.addmaster.yml
+$ ansible-playbook /etc/ansible/21.addmaster.yml
 ```
 
 ### 验证

diff --git a/docs/op/AddNode.md b/docs/op/AddNode.md
@@ -16,13 +16,13 @@
 ...
 # 预留组，后续添加node节点使用
 [new-node]
-192.168.1.6 NODE_ID=node6
+192.168.1.6      #新增node节点
 ...
 ```
 - 执行安装脚本
 
 ``` bash
-$ cd /etc/ansible && ansible-playbook 20.addnode.yml
+$ ansible-playbook /etc/ansible/20.addnode.yml
 ```
 
 ### 验证

diff --git a/roles/lb/defaults/main.yml b/roles/lb/defaults/main.yml
@@ -1,4 +1,5 @@
 # 区分多个instance的VRRP组播，同网段不能重复，取值在0-255之间
-# 可以直接指定数字，如ROUTER_ID=59
-# 本项目取100~200间的随机数
-ROUTER_ID: "{{ 200 | random(100,1) }}"
+# 可以直接指定数字，如ROUTER_ID: 69
+# 取100~200间的随机数
+#ROUTER_ID: "{{ 200 | random(100,1) }}"
+ROUTER_ID: 69
diff --git a/roles/lb/templates/haproxy.cfg.j2 b/roles/lb/templates/haproxy.cfg.j2
@@ -20,9 +20,9 @@ listen kube-master
         mode tcp
         option tcplog
         balance source
-    {% for host in groups['kube-master'] %}
-        server {{host.inventory_hostname}} {{host.inventory_hostname}}:6443 check inter 2000 fall 2 rise 2 weight 1
-    {% endfor %}
-    {% for host in groups['new-master'] %}
-        server {{host.inventory_hostname}} {{host.inventory_hostname}}:6443 check inter 2000 fall 2 rise 2 weight 1
-    {% endfor %}
+{% for host in groups['kube-master'] %}
+        server {{ host }} {{ host }}:6443 check inter 2000 fall 2 rise 2 weight 1
+{% endfor %}
+{% for host in groups['new-master'] %}
+        server {{ host }} {{ host }}:6443 check inter 2000 fall 2 rise 2 weight 1
+{% endfor %}