Commit Graph

547 Commits

Author SHA1 Message Date
jklj077 e8f96133d7 fix bugs related to vlan ids reusing 2016-04-29 13:47:56 +08:00
jklj077 9906f0588f reuse vlanids 2016-04-29 12:58:48 +08:00
ooooo 996d73c3f4 Merge remote-tracking branch 'upstream/master' into separate 2016-04-27 16:37:31 +08:00
ooooo 25ba87423d fix a little bug 2016-04-27 16:36:32 +08:00
zhongyehong 961baf6ae2 add disk quota 2016-04-27 16:31:46 +08:00
ooooo a1c166bb09 use heartbeat package to keep worker alive in order to separate worker and master 2016-04-27 16:21:04 +08:00
zhuyj17 fb2148833b Add truename on Node list page. 2016-04-25 01:00:06 +08:00
zhuyj17 237ce6f26f Display disk usage on status page. 2016-04-23 18:42:04 +08:00
zhuyj17 92c839ff45 Modify the table on status and status realtime pages. 2016-04-23 17:45:49 +08:00
zhuyj17 6075fe54c4 Display owner of container on Node list page. 2016-04-23 16:37:15 +08:00
ooooo 839ea23135 separate master and worker 2016-04-20 14:50:53 +08:00
ooooo 56242920c4 test 2016-04-20 14:17:12 +08:00
leebaok 38379feb62 [network] check whether IP exists and whether IP out of pool range when releasing IP to user pool by deleting vclusters 2016-04-18 20:26:19 +08:00
ooooo cd0df9847f Merge branch 'master' of https://github.com/unias/docklet into separate 2016-04-18 18:18:36 +08:00
ooooo e313f50b5e add some comment 2016-04-18 18:16:19 +08:00
zhongyehong 3fa04c95b9 Merge remote-tracking branch 'upstream/master' into ipdist 2016-04-18 10:54:50 +08:00
zhongyehong 9fd85a54f7 clean nfs when guest restart 2016-04-18 10:54:21 +08:00
zhongyehong e30d912498 init shared_vlanids when start master without this key in etcd
update R and python demo for basefs
2016-04-18 10:39:24 +08:00
PedroLiu 1f29075caa Merge pull request #60 from PedroLiu/master
2 enhancements
2016-04-18 10:33:07 +08:00
Peidong Liu 9ec437c27a Now token will expires in 3600s
Now workspace name will be checked, if not correct, flask will raise a 500 error
2016-04-18 10:28:26 +08:00
zhuyj17 4000d4f9d6 Fix a bug of status page. 2016-04-18 01:36:00 +08:00
zhuyj17 5f5ee95f8c Merge branch 'master' into displayquota 2016-04-15 23:33:35 +08:00
zhongyehong 7cd40a48e0 fix a bug when create guest #49
add hint for quota #7
2016-04-14 17:26:30 +08:00
zhongyehong a55fcba862 the user in fundation group share vlanid #51 2016-04-14 16:32:50 +08:00
zhuyj17 9bdd012bd0 Add a table in status page to display user's quotas. 2016-04-14 15:52:44 +08:00
zhongyehong 5511e92ab2 Merge remote-tracking branch 'upstream/master' into quotaadd 2016-04-12 18:12:54 +08:00
zhongyehong be05b079c1 make image quota come true,
fix display bug of label,
rename some quota,
2016-04-12 18:11:34 +08:00
zhongyehong fd120f4232 add disk quota, add button on adminpage to add quota #7
move system data to global/sys #41
2016-04-12 15:03:00 +08:00
Donggang Cao 6963dd836d add USER/.ssh/config to disable StrictHostKeyChecking 2016-04-11 09:39:25 -04:00
zhongyehong 354ad95d77 mount tmp from host #39 2016-04-11 15:03:09 +08:00
zhongyehong 99a8bcb07f Merge remote-tracking branch 'upstream/master' 2016-04-11 15:00:48 +08:00
zhongyehong c3ecd0d2a0 Merge remote-tracking branch 'upstream/master' 2016-04-11 14:37:42 +08:00
zhuyj17 02cbccdd15 Set quota in etcd and read from etcd for each container. 2016-04-11 12:17:06 +08:00
zhuyj17 5bdf6f1404 Fix minus quota bug 2016-04-11 11:39:58 +08:00
zhuyj17 8e091a5dfc Fix quota bug. Now quota will be read from groupinfo. 2016-04-10 20:12:48 +08:00
zhongyehong bf3eb91c27 fix mismatching of nfs mountpoint #35 2016-04-10 12:52:03 +08:00
zhongyehong 9437ae4447 move sys_run code to try block #18
use sys_run instead of self.sys_call in imagemgr.py
2016-04-08 15:41:56 +08:00
leebaok c3134256cf [lxc.custom.conf] support lxc.custom.conf in appending mode 2016-04-07 16:44:27 +08:00
leebaok c4f1a1c041 [bug] use clusterid-containerid as container's veth.pair name
because lxc config item length limit in 16 bytes
2016-04-07 15:23:27 +08:00
zhong 32d56db3a6 remove some useless notes 2016-04-06 17:22:06 +08:00
zhong d409d2358e can remove quota group from web page
can add quota with just one click
2016-04-06 14:43:16 +08:00
zhong 402fcf8c91 Merge remote-tracking branch 'upstream/master' into adminpage 2016-04-06 13:42:05 +08:00
zhong 6a438d1444 Merge remote-tracking branch 'upstream/master' into stopbug 2016-04-06 10:39:58 +08:00
zhong 4d46f06c73 fix bug of stop container #14 2016-04-06 10:37:50 +08:00
zhuyj17 3aa87cf858 Display quota in Status page. 2016-04-05 17:41:43 +08:00
zhong 08df8532b2 move quota group from database to json file 2016-04-05 17:36:39 +08:00
leebaok 66906a1424 [Init] init repository with Docklet 0.2.6 2016-03-31 16:03:38 +08:00