diff --git a/src/network.py b/src/network.py index 2101510..5e6250a 100755 --- a/src/network.py +++ b/src/network.py @@ -544,11 +544,6 @@ class NetworkMgr(object): def has_user(self, username): [status, _value] = self.etcd.getkey("network/users/"+username) - if status: - self.load_usrgw(username) - if username not in self.usrgws.keys(): - self.usrgws[username] = self.masterip - self.dump_usrgw(username) return status def acquire_userips(self, username, num=1): diff --git a/src/vclustermgr.py b/src/vclustermgr.py index 6bf9f3a..01e955a 100755 --- a/src/vclustermgr.py +++ b/src/vclustermgr.py @@ -99,6 +99,9 @@ class VclusterMgr(object): [success,message] = self.networkmgr.setup_usrgw(username, self.nodemgr) if not success: return [False, message] + elif not self.networkmgr.has_usrgw(username): + self.networkmgr.usrgws[username] = self.networkmgr.masterip + self.networkmgr.dump_usrgw(username) [status, result] = self.networkmgr.acquire_userips_cidr(username, clustersize) gateway = self.networkmgr.get_usergw(username) vlanid = self.networkmgr.get_uservlanid(username)