Merge lp:~nuclearbob/utah/mount-iso into lp:utah

[Max Brustkern]

This branch mounts desktop images for nfs export for cobbler installs instead of extracting every file using bsdtar. I've tested it in magners, which should indicate the rest of the changes in the current dev branch are also fine for baremetal installations, which is good to know.

[Joe Talbott (joetalbott)]

Do you want to remove lines 43-45?

[Javier Collado (javier.collado)]

I think everything looks fine, but I need some comment to know (and remind me
later) why mount/umount are preferred over fuseiso/fusermount.

review: Needs Information

[Max Brustkern (nuclearbob)]

I think this may not work on server images, actually. I'm going to test and figure that out.

When I tried to export a directory containing a fuseiso mounted image over nfs, I was unable to connect to it properly, using the installer or the normal nfs mount commands.

review: Needs Information

[lp:~nuclearbob/utah/mount-iso]

813. By Max Brustkern on 2013-01-24

Added image mounting for server and alternate installs

814. By Max Brustkern on 2013-01-24

Changing initrd setup to use isodir

815. By Max Brustkern on 2013-01-24

Removed cinitrd overwrite

816. By Max Brustkern on 2013-01-25

Removed old code

[Max Brustkern (nuclearbob)]

This should work on server images now as well.

review: Needs Resubmitting

[Joe Talbott (joetalbott)]

Looks good to me.

review: Approve

[Max Brustkern (nuclearbob)]

I'm going to merge this and https://code.launchpad.net/~javier.collado/utah/bug1101189-2/+merge/144755 and begin testing for a potential new stable version.

=== modified file 'utah/iso.py'
--- utah/iso.py	2012-12-12 10:54:13 +0000
+++ utah/iso.py	2013-01-25 20:43:21 +0000
@@ -266,13 +266,6 @@
 
         return stdout
 
-    def extractall(self):
-        """
-        Extract all files to the current directory.
-        """
-        for myfile in self.listfiles(returnlist=True):
-            self.extract(myfile)
-
     def getmd5(self, path):
         """
         Return the md5 checksum of a file.

=== modified file 'utah/provisioning/baremetal/cobbler.py'
--- utah/provisioning/baremetal/cobbler.py	2013-01-18 18:29:31 +0000
+++ utah/provisioning/baremetal/cobbler.py	2013-01-25 20:43:21 +0000
@@ -63,6 +63,8 @@
         self._custominit()
         self._depcheck()
 
+        self.isodir = None
+
         # TODO: Rework cinitrd to be less of a confusing collection of kludges
         self.cinitrd = None
         if self.installtype in ['alternate', 'server']:
@@ -98,19 +100,22 @@
         """
         self.tmpdir = tempfile.mkdtemp(prefix='/tmp/' + self.name + '_')
         self.cleanfile(self.tmpdir)
-        os.chdir(self.tmpdir)
+        os.chmod(self.tmpdir, 0775)
 
-        # TODO: try to remove this step, mount the iso and import that
-        # with a specified kernel/preseed/initrd from the tmpdir
         if self.installtype in ['alternate', 'desktop', 'server']:
-            self.logger.info('Extracting image to ' + self.tmpdir)
-            self.image.extractall()
+            self.logger.info('Mounting image')
+            self.isodir = os.path.join(self.tmpdir, 'iso.d')
+            self.cleanfunction(self._removenfs)
+            os.makedirs(self.isodir, mode=0775)
+            self.logger.debug('Mounting ISO')
+            self._runargs(['sudo', 'mount', '-o', 'loop', self.image.image,
+                           self.isodir])
 
         kernel = self._preparekernel()
         if self.cinitrd is None:
             cinitrd = None
         else:
-            cinitrd = os.path.join(self.tmpdir, self.cinitrd)
+            cinitrd = os.path.join(self.isodir, self.cinitrd)
         initrd = self._prepareinitrd(initrd=cinitrd)
         self._unpackinitrd(initrd=initrd)
         self._setuplatecommand()
@@ -126,20 +131,17 @@
         self._setuppreseed()
         initrd = self._repackinitrd()
 
-        if cinitrd is not None and initrd != cinitrd:
-            os.chmod(cinitrd, 0755)
-            shutil.copyfile(initrd, cinitrd)
-
         self.logger.info('Setting up system with cobbler')
         self._cleanupcobbler()
 
         preseed = os.path.join(self.tmpdir, 'initrd.d', 'preseed.cfg')
 
         if self.installtype in ['alternate', 'server']:
-            # TODO: maybe do this without unpacking ISO
             self.logger.info('Importing image')
             self._cobble(['import', '--name=' + self.cname,
-                          '--path=' + self.tmpdir, '--arch=' + self.carch])
+                          '--path=' + self.isodir, '--arch=' + self.carch])
+            self._cobble(['distro', 'edit', '--name=' + self.cname,
+                          '--kernel=' + kernel, '--initrd=' + initrd])
         elif self.installtype in ['mini', 'desktop']:
             self.logger.info('Creating distro')
             self._cobble(['distro', 'add', '--name=' + self.cname,
@@ -151,11 +153,10 @@
         if self.installtype == 'desktop':
             self.logger.info('Setting up NFS for desktop install')
             self.logger.debug('Adding export to NFS config file')
-            self.cleanfunction(self._removenfs)
             pipe = pipes.Template()
             pipe.append('sudo tee -a ' + str(config.nfsconfigfile) +
                         ' >/dev/null', '-.')
-            pipe.open('/dev/null', 'w').write(self.tmpdir + ' ' +
+            pipe.open('/dev/null', 'w').write(self.isodir + ' ' +
                                               config.nfsoptions + "\n")
             self.logger.debug('Reloading NFS config')
             self._runargs(config.nfscommand + ['reload'])
@@ -166,7 +167,7 @@
                 iface = config.bridge
             ip = netifaces.ifaddresses(iface)[netifaces.AF_INET][0]['addr']
             self.cmdline += (' root=/dev/nfs netboot=nfs nfsroot=' +
-                             ip + ':' + self.tmpdir)
+                             ip + ':' + self.isodir)
             self.cmdline = self.cmdline.strip()
 
         self.cleanfunction(self._cleanupcobbler)
@@ -199,7 +200,6 @@
         retry(self.sshcheck, checktimeout, logmethod=self.logger.info)
 
         if self.installtype == 'desktop':
-            self.logger.info('Removing NFS share')
             self._removenfs()
 
         self.provisioned = True
@@ -268,11 +268,17 @@
         """
         Remove our NFS configuration and reload NFS.
         """
-        self.logger.info('Removing NFS share')
-        self._runargs(['sudo', 'sed', '/' + self.tmpdir.replace('/', '\/') +
-                       '/d', '-i', config.nfsconfigfile])
-        self.logger.debug('Reloading NFS config')
-        self._runargs(config.nfscommand + ['reload'])
+        if self.isodir is not None:
+            self.logger.info('Removing NFS share')
+            self._runargs(['sudo', 'sed', '/' + self.isodir.replace('/', '\/')
+                           + '/d', '-i', config.nfsconfigfile])
+            self.logger.debug('Reloading NFS config')
+            self._runargs(config.nfscommand + ['reload'])
+            self.logger.info('Unmounting ISO')
+            self._runargs(['sudo', 'umount', self.isodir])
+            self.logger.debug('Removing directory')
+            os.rmdir(self.isodir)
+            self.isodir = None
 
     def _depcheck(self):
         """