X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_lxc.py;h=c409b329e66892970aba99804cb27c506e8a3ca9;hb=4cea67f19270ef239d1fa352c5d8757c5fe5f09b;hp=4aa6a21ecd0675c69e8a0c26ac1b2ee74cb2ca6b;hpb=95bca61d9de72d428fe0054596b0faf952e0bc5b;p=nodemanager.git

diff --git a/sliver_lxc.py b/sliver_lxc.py
index 4aa6a21..c409b32 100644
--- a/sliver_lxc.py
+++ b/sliver_lxc.py
@@ -47,6 +47,9 @@ class Sliver_LXC(Sliver_Libvirt, Initscript):
             return
         # 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']:
+            Account.mount_ssh_dir(self.name)
         Sliver_Libvirt.start (self, delay)
         # if a change has occured in the slice initscript, reflect this in /etc/init.d/vinit.slice
         self.refresh_slice_vinit()
@@ -217,7 +220,7 @@ unset pathmunge
         try:
             with open(template_filename) as f:
                 template = Template(f.read())
-                xml  = template.substitute(name=name, interfaces=interfaces, arch=arch)
+                xml  = template.substitute(name=name, xid=xid, interfaces=interfaces, arch=arch)
         except IOError:
             logger.log('Failed to parse or use XML template file %s'%template_filename)
             return
@@ -233,6 +236,8 @@ unset pathmunge
 
     @staticmethod
     def destroy(name):
+        # umount .ssh directory - only if mounted
+        Account.umount_ssh_dir(name)
         logger.verbose ('sliver_lxc: %s destroy'%(name))
         conn = Sliver_Libvirt.getConnection(Sliver_LXC.TYPE)