m26508134
/
docklet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove GRE

This commit is contained in:
zhuyj17 2017-05-09 15:35:31 +08:00
parent c2d1d6e124
commit f9ac5106cc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nodemgr.py
View File

@ -109,14 +109,14 @@ class NodeMgr(object):
logger.info ("new node %s joins" % nodeip)
etcd_runip.append(nodeip)
# setup GRE tunnels for new nodes
if self.addr == nodeip:
'''if self.addr == nodeip:
logger.debug ("worker start on master node. not need to setup GRE")
else:
logger.debug ("setup GRE for %s" % nodeip)
if netcontrol.gre_exists('docklet-br', nodeip):
logger.debug("GRE for %s already exists, reuse it" % nodeip)
else:
netcontrol.setup_gre('docklet-br', nodeip)
netcontrol.setup_gre('docklet-br', nodeip)'''
self.etcd.setkey("machines/runnodes/"+nodeip, "ok")
if nodeip not in self.runnodes:
self.runnodes.append(nodeip)

4
src/worker.py
View File

@ -162,8 +162,8 @@ class Worker(object):
sys.exit(1)
logger.info ("setup GRE tunnel to master %s" % self.master)
#network.netsetup("gre", self.master)
if not netcontrol.gre_exists('docklet-br', self.master):
netcontrol.setup_gre('docklet-br', self.master)
#if not netcontrol.gre_exists('docklet-br', self.master):
#netcontrol.setup_gre('docklet-br', self.master)
# start service of worker
def start(self):