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

Change proxy url to let user can change distributed gateway to non-distributed.

This commit is contained in:
zhuyj17 2017-04-29 17:00:34 +08:00 committed by Peidong Liu
parent 83cba290b4
commit c0709ae9e1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/container.py
View File

@ -7,7 +7,6 @@ import env
from lvmtool import sys_run, check_volume
from monitor import Container_Collector, History_Manager
class Container(object):
def __init__(self, addr, etcdclient):
self.addr = addr

7
src/network.py
View File

@ -450,7 +450,7 @@ class NetworkMgr(object):
self.load_usrgw(username)
return username in self.usrgws.keys()
def setup_usrgw(self, username, nodemgr, worker=None):
def setup_usrgw(self, username, nodemgr, workerip=None):
if not self.has_user(username):
return [False,"user doesn't exist."]
self.load_usrgw(username)
@ -458,8 +458,9 @@ class NetworkMgr(object):
return [False,"user's gateway has been set up."]
self.load_user(username)
usrpools = self.users[username]
if(worker is not None):
ip = nodemgr.rpc_to_ip(worker)
if(workerip is not None):
ip = workerip
worker = nodemgr.ip_to_rpc(workerip)
logger.info("setup gateway for %s with %s and vlan=%s on %s" % (username, usrpools.get_gateway_cidr(), str(usrpools.vlanid), ip))
self.usrgws[username] = ip
self.dump_usrgw(username)