-# $Id$
-# $URL$
+#
"""VServer slivers.
import os, os.path
import time
from threading import BoundedSemaphore
+import subprocess
# the util-vserver-pl module
import vserver
logger.log("vsliver_vs: %s: Installed new initscript in %s"%(self.name,sliver_initscript))
else:
logger.log("vsliver_vs: %s: Removed obsolete initscript %s"%(self.name,sliver_initscript))
+
+ # bind mount root side dir to sliver side
+ # needs to be done before sliver starts
+ def expose_ssh_dir (self):
+ try:
+ root_ssh="/home/%s/.ssh"%self.name
+ sliver_ssh="/vservers/%s/home/%s/.ssh"%(self.name,self.name)
+ # any of both might not exist yet
+ for path in [root_ssh,sliver_ssh]:
+ if not os.path.exists (path):
+ os.mkdir(path)
+ if not os.path.isdir (path):
+ raise Exception
+ mounts=file('/proc/mounts').read()
+ if mounts.find(sliver_ssh)<0:
+ # xxx perform mount
+ subprocess.call("mount --bind -o ro %s %s"%(root_ssh,sliver_ssh),shell=True)
+ logger.log("expose_ssh_dir: %s mounted into slice %s"%(root_ssh,self.name))
+ except:
+ logger.log_exc("expose_ssh_dir with slice %s failed"%self.name)
def start(self, delay=0):
if self.rspec['enabled'] <= 0:
time.sleep(delay)
# the generic /etc/init.d/vinit script is permanently refreshed, and enabled
self.install_and_enable_vinit()
+ # expose .ssh for omf_friendly slivers
+ if 'omf_control' in self.rspec['tags']:
+ self.expose_ssh_dir()
# if a change has occured in the slice initscript, reflect this in /etc/init.d/vinit.slice
self.refresh_slice_vinit()
child_pid = os.fork()
def is_running(self):
return vserver.VServer.is_running(self)
- def set_resources(self,setup=False):
+ def set_resources(self):
disk_max = self.rspec['disk_max']
logger.log('sliver_vs: %s: setting max disk usage to %d KiB' % (self.name, disk_max))
try: # if the sliver is over quota, .set_disk_limit will throw an exception
cpu_pct = self.rspec['cpu_pct']
cpu_share = self.rspec['cpu_share']
- if setup:
- for key in self.rspec.keys():
- if key.find('sysctl.') == 0:
- sysctl=key.split('.')
+ count = 1
+ for key in self.rspec.keys():
+ if key.find('sysctl.') == 0:
+ sysctl=key.split('.')
+ try:
+ # /etc/vservers/<guest>/sysctl/<id>/
+ dirname = "/etc/vservers/%s/sysctl/%s" % (self.name, count)
try:
- path="/proc/sys/%s" % ("/".join(sysctl[1:]))
- logger.log("sliver_vs: %s: opening %s"%(self.name,path))
- flags = os.O_WRONLY
- fd = os.open(path, flags)
- logger.log("sliver_vs: %s: writing %s=%s"%(self.name,key,self.rspec[key]))
- os.write(fd,self.rspec[key])
- os.close(fd)
- except IOError, e:
- logger.log("sliver_vs: %s: could not set %s=%s"%(self.name,key,self.rspec[key]))
- logger.log("sliver_vs: %s: error = %s"%(self.name,e))
+ os.makedirs(dirname, 0755)
+ except:
+ pass
+ setting = open("%s/setting" % dirname, "w")
+ setting.write("%s\n" % key.lstrip("sysctl."))
+ setting.close()
+ value = open("%s/value" % dirname, "w")
+ value.write("%s\n" % self.rspec[key])
+ value.close()
+ count += 1
+
+ logger.log("sliver_vs: %s: writing %s=%s"%(self.name,key,self.rspec[key]))
+ except IOError, e:
+ logger.log("sliver_vs: %s: could not set %s=%s"%(self.name,key,self.rspec[key]))
+ logger.log("sliver_vs: %s: error = %s"%(self.name,e))
if self.rspec['enabled'] > 0: