Merge pull request #19 from gzchen008/develop

gzchen008 · web-flow · commit b133b9fc3bef · 2021-02-02T20:40:22.000+08:00
Closes #15
diff --git a/README.md b/README.md
@@ -75,13 +75,13 @@ sudo ./install.sh
 - Configuration file：conf/install.properties
 
 ```
-ip=[@HOSTIP]
+ip=
 
 # Token added to the cluster, generated by the master script
-token=[#join-token]
+token=
 
 # Master ApiServer IP/VIP
-master=[#master-vip]
+master=
 ```
 
 - Install Command
@@ -101,17 +101,17 @@ sudo ./install.sh install v1.16.6 master_node=true
 
 ```
 # master HA VIP
-master_vip=[#MASTER_VIP]
+master_vip=
 
 # masterIP and VIP
-master_ip_list=[#MASTER_IP_LIST]
+master_ip_list=
 
 # local IP
-local_ip=[@HOSTIP]
+local_ip=
 
 # etcd list, eg: https://ip1:port1,https://ip2:port2,https://ip3:port3; 
 # Please note that the port of dockin-etcd is 5379
-etcd_list=[#ETCD_LIST]
+etcd_list=
 ```
 
 - ETCD Certificate path：/etc/kubernetes/pki/etcd/
diff --git a/dockin-etcd/conf/install.properties b/dockin-etcd/conf/install.properties
@@ -12,4 +12,4 @@
 # the License.
 #
 # IP， ：server_list=(ip1 ip2 ip3)
-server_list=([#dockin_ETCD_SERVER_LIST])
+server_list=
diff --git a/dockin-master/conf/install.properties b/dockin-master/conf/install.properties
@@ -13,10 +13,10 @@
 #
 
 # master HA VIP
-master_vip=[#MASTER_VIP]
+master_vip=
 # masterIP and VIP
-master_ip_list=[#MASTER_IP_LIST]
+master_ip_list=
 # IP
-local_ip=[@HOSTIP]
+local_ip=
 # etcd list, eg: https://ip1:port1,https://ip2:port2,https://ip3:port3;
-etcd_list=[#ETCD_LIST]
+etcd_list=
diff --git a/dockin-worker/conf/install.properties b/dockin-worker/conf/install.properties
@@ -16,11 +16,11 @@
 
 #
 # Node IP
-ip=[@HOSTIP]
+ip=
 
 # master，Node join
 # token，master
-token=[#join-token]
+token=
 
 # Master ApiServer IP/VIP
-master=[#master-vip]
+master=

Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,4 @@`
`12`	`12`	`# the License.`
`13`	`13`	`#`
`14`	`14`	`# IP，：server_list=(ip1 ip2 ip3)`
`15`		`-server_list=([#dockin_ETCD_SERVER_LIST])`
	`15`	`+server_list=`