X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=account.py;h=b15bb6701e8019519b169b0819be5096ec0ea2ac;hb=00f7db000e4126fe1cab0ad6b3244dbc5cc49250;hp=0fd869484bdf7e2e1160718c79198d713332edb0;hpb=0f51f7fc64906f87640def6f27a1dc732ed8f453;p=nodemanager.git diff --git a/account.py b/account.py index 0fd8694..b15bb67 100644 --- a/account.py +++ b/account.py @@ -27,6 +27,7 @@ maximum stack size. import os import pwd, grp import threading +import subprocess import logger import tools @@ -122,6 +123,26 @@ class Account: def stop(self): pass def is_running(self): pass + # bind mount root side dir to sliver side + # needs to be done before sliver starts, in the vserver case at least + 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) + class Worker: def __init__(self, name): @@ -192,23 +213,3 @@ If still valid, check if running and configure/start if not.""" except KeyError: return None return shell_acct_class[shell] - # bind mount root side dir to sliver side - # needs to be done before sliver starts, in the vserver case at least - 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) -