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

release ip when create container failed

This commit is contained in:
zhongyh16 2017-09-19 15:04:10 +08:00
parent 6fbcac579e
commit f56b1fe25b
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/vclustermgr.py
View File

@ -147,6 +147,7 @@ class VclusterMgr(object):
logger.info ("create container with : name-%s, username-%s, clustername-%s, clusterid-%s, hostname-%s, ip-%s, gateway-%s, image-%s" % (lxc_name, username, clustername, str(clusterid), hostname, ips[i], gateway, image_json))
[success,message] = oneworker.create_container(lxc_name, proxy_public_ip, username, uid, json.dumps(setting) , clustername, str(clusterid), str(i), hostname, ips[i], gateway, image_json)
if success is False:
self.networkmgr.release_userips(username, ips[i])
logger.info("container create failed, so vcluster create failed")
return [False, message]
logger.info("container create success")
@ -195,6 +196,7 @@ class VclusterMgr(object):
uid = json.loads(user_info)["data"]["id"]
[success, message] = oneworker.create_container(lxc_name, proxy_public_ip, username, uid, json.dumps(setting), clustername, clusterid, str(cid), hostname, ip, gateway, image_json)
if success is False:
self.networkmgr.release_userips(username, ip)
logger.info("create container failed, so scale out failed")
return [False, message]
if clusterinfo['status'] == "running":