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

fix a bug caused by merge

This commit is contained in:
zhongyehong 2018-04-22 14:45:04 +08:00
parent 867ee221b6
commit 984819686e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/vclustermgr.py
View File

@ -450,7 +450,7 @@ class VclusterMgr(object):
if vcluster.status =='running': if vcluster.status =='running':
return [False, "cluster is still running, you need to stop it and then delete"] return [False, "cluster is still running, you need to stop it and then delete"]
ips = [] ips = []
for container in info['containers']: for container in vcluster.containers:
worker = self.nodemgr.ip_to_rpc(container.host) worker = self.nodemgr.ip_to_rpc(container.host)
if worker is None: if worker is None:
return [False, "The worker can't be found or has been stopped."] return [False, "The worker can't be found or has been stopped."]
@ -480,8 +480,8 @@ class VclusterMgr(object):
if not status: if not status:
return [False, "cluster not found"] return [False, "cluster not found"]
new_containers = [] new_containers = []
for container in info['containers']: for container in vcluster.containers:
if container['containername'] == containername: if container.containername == containername:
worker = self.nodemgr.ip_to_rpc(container.host) worker = self.nodemgr.ip_to_rpc(container.host)
if worker is None: if worker is None:
return [False, "The worker can't be found or has been stopped."] return [False, "The worker can't be found or has been stopped."]