dever 7 år sedan
förälder
incheckning
06a3636f9b
3 ändrade filer med 7 tillägg och 4 borttagningar
  1. 3 1
      src/docker/build/service/consul/consul.sh
  2. 3 3
      src/docker/conf/daemon.conf
  3. 1 0
      src/tool/cluster.py

+ 3 - 1
src/docker/build/service/consul/consul.sh

@@ -8,8 +8,10 @@ start_consul()
 		process_start consul agent -server -bootstrap-expect 1 -data-dir /root/consul/data -config-dir /root/consul/config -client 0.0.0.0
 	elif [ "$1" == "client" ]; then
 		process_start consul agent -client -config-dir /root/consul/config -join 0.0.0.0
+	elif [ `echo $@|grep node|wc -l` -eq 1 ];then
+		process_start consul agent $@ -bind=$ip
     else
-        process_start consul agent $@
+        process_start consul agent $@ -bind=$ip -node=$ip
 	fi
 	#consul members
 }

+ 3 - 3
src/docker/conf/daemon.conf

@@ -4,11 +4,11 @@ default = master
 
 [master]
 image = consul
-num = 3
-port = 8500:8500
 volumes = {container}conf/service/consul:/root/consul/config
-command = consul -server -bootstrap-expect=3 -data-dir=/root/consul/data -config-dir=/root/consul/config -client=0.0.0.0 -bind=$ip -join=daemon-master -node={name}
+command = consul -server -data-dir=/root/consul/data -config-dir=/root/consul/config -client=0.0.0.0 -node={name}
 alias = consul
+slave = 2
+slave_command = consul -server -data-dir=/root/consul/data -config-dir=/root/consul/config -client=0.0.0.0 -join={parent}
 
 [client]
 image = consul

+ 1 - 0
src/tool/cluster.py

@@ -34,6 +34,7 @@ class Cluster(Docker):
 			config['image'] = self.core['images'][config['image']]
 		method(config=config, name=name, item=item, index=num, action=action)
 		if action in ('update', 'restart', 'rm', 'rmb', 'reset', 'run', 'uprun'):
+			time.sleep(2)
 			self.slave(method, config, item, action)
 		if slave == False:
 			self.next(config, action)