From f9ac5106cc025256aa63b640406f00529e5db64e Mon Sep 17 00:00:00 2001 From: zhuyj17 Date: Tue, 9 May 2017 15:35:31 +0800 Subject: [PATCH] Remove GRE --- src/nodemgr.py | 4 ++-- src/worker.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/nodemgr.py b/src/nodemgr.py index 264b442..e3578a8 100755 --- a/src/nodemgr.py +++ b/src/nodemgr.py @@ -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) diff --git a/src/worker.py b/src/worker.py index 07fb8ef..b45f930 100755 --- a/src/worker.py +++ b/src/worker.py @@ -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):