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

Merge remote-tracking branch 'upstream/master' into adminpage

This commit is contained in:
zhongyehong 2016-04-08 13:48:52 +08:00
parent 6e0998e2d7 aed61947b0
commit 545a644f9a
4 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf/container.conf
View File

@ -23,7 +23,8 @@ lxc.utsname = %HOSTNAME%
lxc.network.type = veth
lxc.network.name = eth0
lxc.network.veth.pair = %LXCNAME%
# veth.pair is limited in 16 bytes
lxc.network.veth.pair = %VETHPAIR%
lxc.network.script.up = Bridge=docklet-br VLANID=%VLANID% %LXCSCRIPT%/lxc-ifup
lxc.network.script.down = Bridge=docklet-br %LXCSCRIPT%/lxc-ifdown
lxc.network.ipv4 = %IP%

48
src/container.py
View File

@ -4,7 +4,7 @@ import subprocess, os, json
import imagemgr
from log import logger
import env
from lvmtool import *
from lvmtool import sys_run, check_volume
class Container(object):
def __init__(self, addr, etcdclient):
@ -21,7 +21,7 @@ class Container(object):
self.lxcpath = "/var/lib/lxc"
self.imgmgr = imagemgr.ImageMgr()
def create_container(self, lxc_name, username, user_info, clustername, clusterid, hostname, ip, gateway, vlanid, image):
def create_container(self, lxc_name, username, user_info, clustername, clusterid, containerid, hostname, ip, gateway, vlanid, image):
logger.info("create container %s of %s for %s" %(lxc_name, clustername, username))
try:
user_info = json.loads(user_info)
@ -45,31 +45,41 @@ class Container(object):
sys_run("mkdir -p /var/lib/lxc/%s" % lxc_name)
logger.info("generate config file for %s" % lxc_name)
if os.path.exists(self.confpath+"/lxc.custom.conf"):
conffile = open(self.confpath+"/lxc.custom.conf",'r')
else:
conffile = open(self.confpath+"/container.conf",'r')
def config_prepare(content):
content = content.replace("%ROOTFS%",rootfs)
content = content.replace("%HOSTNAME%",hostname)
content = content.replace("%IP%",ip)
content = content.replace("%GATEWAY%",gateway)
content = content.replace("%CONTAINER_MEMORY%",str(memory))
content = content.replace("%CONTAINER_CPU%",str(cpu))
content = content.replace("%FS_PREFIX%",self.fspath)
content = content.replace("%USERNAME%",username)
content = content.replace("%CLUSTERID%",str(clusterid))
content = content.replace("%LXCSCRIPT%",env.getenv("LXC_SCRIPT"))
content = content.replace("%LXCNAME%",lxc_name)
content = content.replace("%VLANID%",str(vlanid))
content = content.replace("%CLUSTERNAME%", clustername)
content = content.replace("%VETHPAIR%", str(clusterid)+'-'+str(containerid))
return content
conffile = open(self.confpath+"/container.conf", 'r')
conftext = conffile.read()
conffile.close()
conftext = conftext.replace("%ROOTFS%",rootfs)
conftext = conftext.replace("%HOSTNAME%",hostname)
conftext = conftext.replace("%IP%",ip)
conftext = conftext.replace("%GATEWAY%",gateway)
conftext = conftext.replace("%CONTAINER_MEMORY%",str(memory))
conftext = conftext.replace("%CONTAINER_CPU%",str(cpu))
conftext = conftext.replace("%FS_PREFIX%",self.fspath)
conftext = conftext.replace("%USERNAME%",username)
conftext = conftext.replace("%CLUSTERID%",str(clusterid))
conftext = conftext.replace("%LXCSCRIPT%",env.getenv("LXC_SCRIPT"))
conftext = conftext.replace("%LXCNAME%",lxc_name)
conftext = conftext.replace("%VLANID%",str(vlanid))
conftext = conftext.replace("%CLUSTERNAME%", clustername)
conftext = config_prepare(conftext)
conffile = open("/var/lib/lxc/%s/config" % lxc_name,"w")
conffile.write(conftext)
conffile.close()
if os.path.isfile(self.confpath+"/lxc.custom.conf"):
conffile = open(self.confpath+"/lxc.custom.conf", 'r')
conftext = conffile.read()
conffile.close()
conftext = config_prepare(conftext)
conffile = open("/var/lib/lxc/%s/config" % lxc_name, 'a')
conffile.write(conftext)
conffile.close()
#logger.debug(Ret.stdout.decode('utf-8'))
logger.info("create container %s success" % lxc_name)

4
src/vclustermgr.py
View File

@ -84,7 +84,7 @@ class VclusterMgr(object):
lxc_name = username + "-" + str(clusterid) + "-" + str(i)
hostname = "host-"+str(i)
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] = onework.create_container(lxc_name, username, user_info , clustername, str(clusterid), hostname, ips[i], gateway, str(vlanid), image_json)
[success,message] = onework.create_container(lxc_name, username, user_info , clustername, str(clusterid), str(i), hostname, ips[i], gateway, str(vlanid), image_json)
if success is False:
logger.info("container create failed, so vcluster create failed")
return [False, message]
@ -124,7 +124,7 @@ class VclusterMgr(object):
onework = workers[random.randint(0, len(workers)-1)]
lxc_name = username + "-" + str(clusterid) + "-" + str(cid)
hostname = "host-" + str(cid)
[success, message] = onework.create_container(lxc_name, username, user_info, clustername, clusterid, hostname, ip, gateway, str(vlanid), image_json)
[success, message] = onework.create_container(lxc_name, username, user_info, clustername, clusterid, str(cid), hostname, ip, gateway, str(vlanid), image_json)
if success is False:
logger.info("create container failed, so scale out failed")
return [False, message]

5
web/webViews/dockletrequest.py
View File

@ -1,5 +1,4 @@
import requests
import json
from flask import abort, session
from webViews.log import logger
@ -25,9 +24,7 @@ class dockletRequest():
@classmethod
def unauthorizedpost(self, url = '/', data = None):
data = dict(data)
data_log = {'user': data['user']}
logger.info("Docklet Unauthorized Request: data = %s, url = %s" % (data_log, url))
logger.info("Docklet Unauthorized Request: data = %s, url = %s" % (data, url))
result = requests.post(endpoint + url, data = data).json()
logger.info("Docklet Unauthorized Response: result = %s, url = %s"%(result, url))
return result