Merge branch 'ipv6'

[nodemanager.git] / account.py

diff --git a/account.py b/account.py
index b15bb67..b2f9714 100644 (file)
--- a/account.py
+++ b/account.py
@@ -123,25 +123,45 @@ 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):
+    ### this used to be a plain method but because it needs to be invoked by destroy
+    # which is a static method, they need to become static as well
+    # needs to be done before sliver starts (checked with vs and lxc)
+    @staticmethod
+    def mount_ssh_dir (slicename): return Account._manage_ssh_dir (slicename, do_mount=True)
+    @staticmethod
+    def umount_ssh_dir (slicename): return Account._manage_ssh_dir (slicename, do_mount=False)
+
+    # bind mount / umount root side dir to sliver side
+    @staticmethod
+    def _manage_ssh_dir (slicename, do_mount):
+        logger.log ("_manage_ssh_dir, requested to "+("mount" if do_mount else "umount")+" ssh dir for "+ slicename)
         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))
+            root_ssh="/home/%s/.ssh"%slicename
+            sliver_ssh="/vservers/%s/home/%s/.ssh"%(slicename,slicename)
+            def is_mounted (root_ssh):
+                for mount_line in file('/proc/mounts').readlines():
+                    if mount_line.find (root_ssh)>=0: return True
+                return False
+            if do_mount:
+                # 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
+                if not is_mounted(root_ssh):
+                    command=['mount','--bind','-o','ro',root_ssh,sliver_ssh]
+                    mounted=logger.log_call (command)
+                    msg="OK" if mounted else "WARNING: FAILED"
+                    logger.log("_manage_ssh_dir: mounted %s into slice %s - %s"%(root_ssh,slicename,msg))
+            else:
+                if is_mounted (sliver_ssh):
+                    command=['umount',sliver_ssh]
+                    umounted=logger.log_call(command)
+                    msg="OK" if umounted else "WARNING: FAILED"
+                    logger.log("_manage_ssh_dir: umounted %s - %s"%(sliver_ssh,msg))
         except:
-            logger.log_exc("expose_ssh_dir with slice %s failed"%self.name)
+            logger.log_exc("_manage_ssh_dir failed",name=slicename)
 
 class Worker:
 
@@ -164,7 +184,7 @@ If still valid, check if running and configure/start if not."""
         if not isinstance(self._acct, next_class): self._acct = next_class(rec)
         logger.verbose("account.Worker.ensure_created: %s, running=%r"%(self.name,self.is_running()))
 
-        # reservation_alive is set on reervable nodes, and its value is a boolean
+        # reservation_alive is set on reservable nodes, and its value is a boolean
         if 'reservation_alive' in rec:
             # reservable nodes
             if rec['reservation_alive']: