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

Revert "some modifications"

This commit is contained in:
zhong yehong 2016-06-21 17:55:36 +08:00 committed by GitHub
parent 1da7e26378
commit 0535bcd244
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/imagemgr.py
View File

@ -133,7 +133,7 @@ class ImageMgr():
sys_run("mount /dev/%s/%s %s" %(vgname,lxc,layer),True)
#self.sys_call("mkdir -p %s/overlay %s/work" % (layer,layer))
#self.sys_call("mount -t overlay overlay -olowerdir=%s/local/basefs,upperdir=%s/overlay,workdir=%s/work %s" % (self.NFS_PREFIX,layer,layer,rootfs))
sys_run("mount -t aufs -o br=%s=rw:%s/local/basefs=ro+wh -o udba=reval none %s/" % (layer,self.NFS_PREFIX,rootfs),True)
sys_run("mount -t aufs -o br=%s=rw:%s/local/basefs=ro+wh none %s/" % (layer,self.NFS_PREFIX,rootfs),True)
sys_run("mkdir -p %s/local/temp/%s" % (self.NFS_PREFIX,lxc))
except Exception as e:
@ -178,7 +178,7 @@ class ImageMgr():
sys_run("mount /dev/%s/%s %s" % (vgname,lxc,layer))
Ret = sys_run("mountpoint %s" % rootfs)
if Ret.returncode != 0:
sys_run("mount -t aufs -o br=%s=rw:%s/local/basefs=ro+wh -o udba=reval none %s/" % (layer,self.NFS_PREFIX,rootfs))
sys_run("mount -t aufs -o br=%s=rw:%s/local/basefs=ro+wh none %s/" % (layer,self.NFS_PREFIX,rootfs))
return True

10
web/templates/addCluster.html
View File

@ -37,11 +37,14 @@
<div class="box-body">
<form id="form" class="form-horizontal" action="/workspace/add/" method="POST">
<div class="row">
<div class="form-group"><label class="col-sm-2 control-label">Workspace Name</label>
<div class="col-sm-10"><input type="text" class="form-control" name="clusterName" id="clusterName"></div>
</div>
</div>
<div class="hr-line-dashed"></div>
<br/>
<div class="row">
<div class="form-group"><label class="col-sm-2 control-label">Image Choose</label>
<div class="col-sm-10">
<table class="table table-striped table-bordered table-hover table-image" >
@ -83,9 +86,10 @@
{% endfor %}
{% endfor %}
</tbody>
</table>
</div>
</div>
</table>
</div>
</div>
</div>
<div class="hr-line-dashed"></div>
<br/>

2
web/templates/base_AdminLTE.html
View File

@ -163,7 +163,7 @@
<a href='/notification/'><i class="fa fa-envelope"></i> <span class="nav-label">Notifications</span></a>
</li>
<li id="admin">
<a href='/admin/'><i class="fa fa-user"></i> <span class="nav-label">Admin</span></a>
<a href='/admin/'><i class="fa fa-gears"></i> <span class="nav-label">Admin</span></a>
</li>
{% endif %}