support for scheduling cores to slices

[nodemanager.git] / sliver_vs.py

diff --git a/sliver_vs.py b/sliver_vs.py
index 2554c2a..78ff482 100644 (file)
--- a/sliver_vs.py
+++ b/sliver_vs.py
@@ -23,6 +23,7 @@ import traceback
 import os, os.path
 import time
 from threading import BoundedSemaphore
+import subprocess
 
 # the util-vserver-pl module
 import vserver
@@ -172,7 +173,7 @@ class Sliver_VS(accounts.Account, vserver.VServer):
     # 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]: 
@@ -184,8 +185,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 +197,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()