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

fix a bug of user directory not exists

This commit is contained in:
zhongyh16 2017-05-15 17:29:46 +08:00
parent 6590458591
commit 90d8098849
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/container.py
View File

@ -26,8 +26,6 @@ class Container(object):
def create_container(self, lxc_name, proxy_server_ip, username, setting, clustername, clusterid, containerid, hostname, ip, gateway, vlanid, image): def create_container(self, lxc_name, proxy_server_ip, username, setting, clustername, clusterid, containerid, hostname, ip, gateway, vlanid, image):
logger.info("create container %s of %s for %s" %(lxc_name, clustername, username)) logger.info("create container %s of %s for %s" %(lxc_name, clustername, username))
try: try:
path = env.getenv('DOCKLET_LIB')
subprocess.call([path+"/userinit.sh", username])
setting = json.loads(setting) setting = json.loads(setting)
cpu = int(setting['cpu']) * 100000 cpu = int(setting['cpu']) * 100000
memory = setting["memory"] memory = setting["memory"]
@ -45,8 +43,9 @@ class Container(object):
rootfs = "/var/lib/lxc/%s/rootfs" % lxc_name rootfs = "/var/lib/lxc/%s/rootfs" % lxc_name
if not os.path.isdir("%s/global/users/%s" % (self.fspath,username)): if not os.path.isdir("%s/global/users/%s" % (self.fspath,username)):
logger.error("user %s directory not found" % username) path = env.getenv('DOCKLET_LIB')
return [False, "user directory not found"] subprocess.call([path+"/userinit.sh", username])
logger.info("user %s directory not found, create it" % username)
sys_run("mkdir -p /var/lib/lxc/%s" % lxc_name) sys_run("mkdir -p /var/lib/lxc/%s" % lxc_name)
logger.info("generate config file for %s" % lxc_name) logger.info("generate config file for %s" % lxc_name)

2
src/userinit.sh
View File

@ -13,7 +13,7 @@ USERNAME=$1
echo "[Info] [userinit.sh] initialize for user $USERNAME" echo "[Info] [userinit.sh] initialize for user $USERNAME"
USER_DIR=$FS_PREFIX/global/users/$USERNAME USER_DIR=$FS_PREFIX/global/users/$USERNAME
[ -d $USER_DIR ] && echo "[userinit.sh] user directory already exists, delete it" && rm -r $USER_DIR [ -d $USER_DIR ] && echo "[userinit.sh] user directory already exists" && exit 0
mkdir -p $USER_DIR/{clusters,hosts,data,ssh} mkdir -p $USER_DIR/{clusters,hosts,data,ssh}