X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_lxc.py;h=1b82b45f7ea1054613f0297098b6ac2810479ac9;hb=570d234b7d7b40416b296de71225f28c826ee991;hp=07d16333637f0cfdd0baf3d97d4401849d88581e;hpb=2c3f1eb6cc38c907052b5ccd977bc10577442a41;p=nodemanager.git

diff --git a/sliver_lxc.py b/sliver_lxc.py
index 07d1633..1b82b45 100644
--- a/sliver_lxc.py
+++ b/sliver_lxc.py
@@ -117,8 +117,6 @@ class Sliver_LXC(Sliver_Libvirt, Initscript):
                 arch = 'i686'
 
 
-
-
         refImgDir    = os.path.join(Sliver_LXC.REF_IMG_BASE_DIR, vref)
         containerDir = os.path.join(Sliver_LXC.CON_BASE_DIR, name)
 
@@ -129,7 +127,9 @@ class Sliver_LXC(Sliver_Libvirt, Initscript):
             logger.log('sliver_lxc: {}: ERROR Expected reference image in {}'.format(name, refImgDir))
             return
 
-# this hopefully should be fixed now
+# during some time this fragment had been commented out
+# but we're seeing cases where this code might actually be useful, so..
+#        this hopefully should be fixed now
 #        # in fedora20 we have some difficulty in properly cleaning up /vservers/<slicename>
 #        # also note that running e.g. btrfs subvolume create /vservers/.lvref/image /vservers/foo
 #        # behaves differently, whether /vservers/foo exists or not:
@@ -137,15 +137,15 @@ class Sliver_LXC(Sliver_Libvirt, Initscript):
 #        # but if it does exist, then       it creates /vservers/foo/image !!
 #        # so we need to check the expected container rootfs does not exist yet
 #        # this hopefully could be removed in a future release
-#        if os.path.exists (containerDir):
-#            logger.log("sliver_lxc: {}: WARNING cleaning up pre-existing {}".format(name, containerDir))
-#            command = ['btrfs', 'subvolume', 'delete', containerDir]
-#            logger.log_call(command, BTRFS_TIMEOUT)
-#            # re-check
-#            if os.path.exists (containerDir):
-#                logger.log('sliver_lxc: {}: ERROR Could not create sliver - could not clean up empty {}'
-#                           .format(name, containerDir))
-#                return
+        if os.path.exists (containerDir):
+            logger.log("sliver_lxc: {}: WARNING cleaning up pre-existing {}".format(name, containerDir))
+            command = ['btrfs', 'subvolume', 'delete', containerDir]
+            logger.log_call(command, BTRFS_TIMEOUT)
+            # re-check
+            if os.path.exists (containerDir):
+                logger.log('sliver_lxc: {}: ERROR Could not create sliver - could not clean up empty {}'
+                           .format(name, containerDir))
+                return
 
         # Snapshot the reference image fs
         # this assumes the reference image is in its own subvolume
@@ -182,7 +182,7 @@ class Sliver_LXC(Sliver_Libvirt, Initscript):
                    'ssh-keygen -t rsa -N "" -f /home/{}/.ssh/id_rsa'.format(name)]
         logger.log_call(command)
 
-        command = ['chown', '-R', '{}.slices'.format(name), '/home/{}/.ssh'.format(name)]
+        command = ['chown', '-R', '{}:slices'.format(name), '/home/{}/.ssh'.format(name)]
         logger.log_call(command)
 
         command = ['mkdir', '{}/root/.ssh'.format(containerDir)]
@@ -339,13 +339,13 @@ unset pathmunge
         logger.verbose ('sliver_lxc: {} destroy'.format(name))
         conn = Sliver_Libvirt.getConnection(Sliver_LXC.TYPE)
 
-        containerDir = Sliver_LXC.CON_BASE_DIR + '/%s'%(name)
+        containerDir = os.path.join(Sliver_LXC.CON_BASE_DIR, name)
 
         try:
             # Destroy libvirt domain
             dom = conn.lookupByName(name)
         except:
-            logger.verbose('sliver_lxc.destroy: Domain %s does not exist!' % name)
+            logger.verbose('sliver_lxc.destroy: Domain {} does not exist!'.format(name))
             return
 
         # Slivers with vsys running will fail the subvolume delete
@@ -353,16 +353,16 @@ unset pathmunge
         vsys_stopped = removeSliverFromVsys (name)
 
         try:
-            logger.log("sliver_lxc.destroy: destroying domain %s"%name)
+            logger.log("sliver_lxc.destroy: destroying domain {}".format(name))
             dom.destroy()
         except:
-            logger.verbose('sliver_lxc.destroy: Domain %s not running... continuing.' % name)
+            logger.verbose("sliver_lxc.destroy: Domain {} not running... continuing.".format(name))
 
         try:
-            logger.log("sliver_lxc.destroy: undefining domain %s"%name)
+            logger.log("sliver_lxc.destroy: undefining domain {}".format(name))
             dom.undefine()
         except:
-            logger.verbose('sliver_lxc.destroy: Domain %s is not defined... continuing.' % name)
+            logger.verbose('sliver_lxc.destroy: Domain {} is not defined... continuing.'.format(name))
 
         # Remove user after destroy domain to force logout
         command = ['/usr/sbin/userdel', '-f', '-r', name]
@@ -373,7 +373,7 @@ unset pathmunge
         logger.log_call(command, timeout=BTRFS_TIMEOUT)
 
         # ???
-        logger.log("-TMP-ls-l %s"%name)
+        logger.log("-TMP-ls-l {}".format(name))
         command = ['ls', '-lR', containerDir]
         logger.log_call(command)
         logger.log("-TMP-vsys-status")
@@ -398,22 +398,22 @@ unset pathmunge
         # also lsof never shows anything relevant; this is painful..
 
         if not os.path.exists(containerDir):
-            logger.log('sliver_lxc.destroy: %s cleanly destroyed.'%name)
+            logger.log('sliver_lxc.destroy: {} cleanly destroyed.'.format(name))
         else:
             # we're in /
-            #logger.log("-TMP-cwd %s : %s"%(name, os.getcwd()))
+            #logger.log("-TMP-cwd {} : {}".format(name, os.getcwd()))
             # also lsof never shows anything relevant; this is painful..
-            #logger.log("-TMP-lsof %s"%name)
+            #logger.log("-TMP-lsof {}".format(name))
             #command = ['lsof']
             #logger.log_call(command)
-            logger.log("-TMP-ls-l %s"%name)
+            logger.log("-TMP-ls-l {}".format(name))
             command = ['ls', '-lR', containerDir]
             logger.log_call(command)
             logger.log("-TMP-lsof")
             command = ['lsof']
             logger.log_call(command)
             if os.path.exists(containerDir):
-                logger.log('sliver_lxc.destroy: ERROR could not cleanly destroy %s - giving up'%name)
+                logger.log('sliver_lxc.destroy: ERROR could not cleanly destroy {} - giving up'.format(name))
 
         if vsys_stopped:
             vsysStartService()