X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_vs.py;h=8382c6dcd8aecd764003f7059c05ef74dd84b4c6;hb=refs%2Fheads%2Fdevel;hp=2554c2aac979bb87352e9ca17bbc82b72652577a;hpb=4ced87d3169c9eaa821128b3cc9ba59cccb29e33;p=nodemanager.git diff --git a/sliver_vs.py b/sliver_vs.py index 2554c2a..8382c6d 100644 --- a/sliver_vs.py +++ b/sliver_vs.py @@ -1,4 +1,4 @@ -# +# """VServer slivers. @@ -21,8 +21,10 @@ don't have to guess if there is a running process or not. import errno import traceback import os, os.path +import sys import time from threading import BoundedSemaphore +import subprocess # the util-vserver-pl module import vserver @@ -62,7 +64,7 @@ class Sliver_VS(accounts.Account, vserver.VServer): logger.log_exc("sliver_vs:__init__ (first chance) %s",name=name) logger.log('sliver_vs: %s: recreating bad vserver' % name) self.destroy(name) - self.create(name, rec['vref']) + self.create(name, rec) logger.log("sliver_vs: %s: second chance..."%name) vserver.VServer.__init__(self, name,logfile='/var/log/nodemanager') @@ -75,8 +77,9 @@ class Sliver_VS(accounts.Account, vserver.VServer): self.configure(rec) @staticmethod - def create(name, vref = None): + def create(name, rec = None): logger.verbose('sliver_vs: %s: create'%name) + vref = rec['vref'] if vref is None: logger.log("sliver_vs: %s: ERROR - no vref attached, this is unexpected"%(name)) # added by caglar @@ -107,8 +110,18 @@ class Sliver_VS(accounts.Account, vserver.VServer): personality="linux64" return personality + command=[] + # be verbose + command += ['/bin/bash','-x',] + command += ['/usr/sbin/vuseradd', ] + if 'attributes' in rec and 'isolate_loopback' in rec['attributes'] and rec['attributes']['isolate_loopback'] == '1': + command += [ "-i",] + # the vsliver imge to use + command += [ '-t', vref, ] + # slice name + command += [ name, ] # logger.log_call(['/usr/sbin/vuseradd', '-t', vref, name, ], timeout=15*60) - logger.log_call(['/bin/bash','-x','/usr/sbin/vuseradd', '-t', vref, name, ], timeout=15*60) + logger.log_call(command, timeout=15*60) # export slicename to the slice in /etc/slicename file('/vservers/%s/etc/slicename' % name, 'w').write(name) file('/vservers/%s/etc/slicefamily' % name, 'w').write(vref) @@ -123,6 +136,9 @@ class Sliver_VS(accounts.Account, vserver.VServer): logger.log_call(['/bin/bash','-x','/usr/sbin/vuserdel', name, ]) def configure(self, rec): + # in case we update nodemanager.. + self.install_and_enable_vinit() + new_rspec = rec['_rspec'] if new_rspec != self.rspec: self.rspec = new_rspec @@ -146,8 +162,8 @@ class Sliver_VS(accounts.Account, vserver.VServer): rc3_link="/vservers/%s/etc/rc.d/rc3.d/S99vinit"%self.name rc3_target="../init.d/vinit" # install in sliver - body=file(vinit_source).read() - if tools.replace_file_with_string(vinit_script,body,chmod=0755): + code=file(vinit_source).read() + if tools.replace_file_with_string(vinit_script,code,chmod=0755): logger.log("vsliver_vs: %s: installed generic vinit rc script"%self.name) # create symlink for runlevel 3 if not os.path.islink(rc3_link): @@ -157,25 +173,36 @@ class Sliver_VS(accounts.Account, vserver.VServer): except: logger.log_exc("vsliver_vs: %s: failed to create runlevel3 symlink %s"%rc3_link) + def rerun_slice_vinit(self): + command = "/usr/sbin/vserver %s exec /etc/rc.d/init.d/vinit restart" % (self.name) + logger.log("vsliver_vs: %s: Rerunning slice initscript: %s" % (self.name, command)) + subprocess.call(command + "&", stdin=open('/dev/null', 'r'), stdout=open('/dev/null', 'w'), stderr=subprocess.STDOUT, shell=True) + # this one checks for the existence of the slice initscript # install or remove the slice inistscript, as instructed by the initscript tag def refresh_slice_vinit(self): - body=self.initscript + code=self.initscript sliver_initscript="/vservers/%s/etc/rc.d/init.d/vinit.slice"%self.name - if tools.replace_file_with_string(sliver_initscript,body,remove_if_empty=True,chmod=0755): - if body: + if tools.replace_file_with_string(sliver_initscript,code,remove_if_empty=True,chmod=0755): + if code: logger.log("vsliver_vs: %s: Installed new initscript in %s"%(self.name,sliver_initscript)) + if self.is_running(): + # Only need to rerun the initscript if the vserver is + # already running. If the vserver isn't running, then the + # initscript will automatically be started by + # /etc/rc.d/vinit when the vserver is started. + self.rerun_slice_vinit() 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" + 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]: + for path in [root_ssh,sliver_ssh]: if not os.path.exists (path): os.mkdir(path) if not os.path.isdir (path): @@ -184,8 +211,9 @@ class Sliver_VS(accounts.Account, vserver.VServer): 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("expose_ssh_dir with slice %s failed"%self.name) + logger.log_exc("expose_ssh_dir with slice %s failed"%self.name) def start(self, delay=0): if self.rspec['enabled'] <= 0: @@ -195,7 +223,9 @@ class Sliver_VS(accounts.Account, vserver.VServer): time.sleep(delay) # the generic /etc/init.d/vinit script is permanently refreshed, and enabled self.install_and_enable_vinit() - self.expose_ssh_dir() + # 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() @@ -293,7 +323,10 @@ class Sliver_VS(accounts.Account, vserver.VServer): if self.rspec['ip_addresses'] != '0.0.0.0': logger.log('sliver_vs: %s: setting IP address(es) to %s' % \ (self.name, self.rspec['ip_addresses'])) - self.set_ipaddresses_config(self.rspec['ip_addresses']) + add_loopback = True + if 'isolate_loopback' in self.rspec['tags']: + add_loopback = self.rspec['tags']['isolate_loopback'] != "1" + self.set_ipaddresses_config(self.rspec['ip_addresses'], add_loopback) #logger.log("sliver_vs: %s: Setting name to %s" % (self.name, self.slice_id)) #self.setname(self.slice_id)