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

Merge pull request #389 from GallenShao/master 

fix a bug in port mapping
This commit is contained in:
GallenShao 2019-05-24 19:48:52 +08:00 committed by GitHub
parent 96a046ddeb f830ab87ed
commit 8757ab6391
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/master/vclustermgr.py
View File

@ -380,14 +380,13 @@ class VclusterMgr(object):
[success,msg] = worker.release_port_mapping(node_name, node_ip, str(node_port)) [success,msg] = worker.release_port_mapping(node_name, node_ip, str(node_port))
else: else:
[success,msg] = portcontrol.release_port_mapping(node_name, node_ip, str(node_port)) [success,msg] = portcontrol.release_port_mapping(node_name, node_ip, str(node_port))
if not success:
return [False,msg]
db.session.delete(item) db.session.delete(item)
break db.session.commit()
else: if success:
return [False,"No port mapping."] return [True, json.loads(str(vcluster))]
db.session.commit() else:
return [True, json.loads(str(vcluster))] return [False, msg]
return [False, "No port mapping."]
def flush_cluster(self,username,clustername,containername): def flush_cluster(self,username,clustername,containername):
begintime = datetime.datetime.now() begintime = datetime.datetime.now()