Merge lp:~nuclearbob/utah/loop-exception into lp:utah

[Max Brustkern]

This branch raises an exception when an attempt to mount an ISO fails. If the status is 2, the exception suggests a lack of loop devices as the most likely cause.

To test this, I copied the inventory database from mangers-orchestra, installed NFS on my local machine, mounted enough ISOs to fill up all of my loop devices, and ran this command from the branch directory:
PYTHONPATH=. ./examples/run_test_cobbler.py --name acer-veriton-03 /usr/share/utah/client/examples/pass.run -i /var/cache/utah/iso/precise-desktop-i386.iso

[Joe Talbott (joetalbott)]

Looks good to me.

On line 41 perhaps you could just have:

raise UTAHBMProvisioningException(
    'NFS needed for {}'.format(self.installtype)
)

review: Approve

[Andy Doan (doanac)]

On 02/13/2013 09:46 AM, Max Brustkern wrote:
> + raise UTAHBMProvisioningException(
> + 'Mount failed with return code: {}'
> + .format(returncode))

Could you add the command's output to this as well?

[lp:~nuclearbob/utah/loop-exception]

818. By Max Brustkern on 2013-02-13

Improved exception install type specification

[Joe Talbott (joetalbott)]

Comment on line 33 needs to be updated as well.

[Javier Collado (javier.collado)]

I reproduced the problem as explained in the merge description and worked as expected.

review: Approve

[Max Brustkern (nuclearbob)]

Implemented that.

review: Needs Resubmitting

[lp:~nuclearbob/utah/loop-exception]

819. By Max Brustkern on 2013-02-13

Finished sentence

820. By Max Brustkern on 2013-02-13

Added output to exception

[Max Brustkern (nuclearbob)]

Initially I didn't include the output because I was worried it might be long, but as I've tested various mount errors, it seems to mostly be reasonably compact. I'm removed the special check for return status 2 and just return the output for all failures, since the loop device failure will show up in the output.

review: Needs Resubmitting

[lp:~nuclearbob/utah/loop-exception]

821. By Max Brustkern on 2013-02-13

Fixed now-erroneous comment

[Joe Talbott (joetalbott)]

Looks good to me. Thanks.

review: Approve

[Andy Doan (doanac)]

+1 - thanks

=== modified file 'utah/provisioning/baremetal/cobbler.py'
--- utah/provisioning/baremetal/cobbler.py	2013-01-29 16:43:59 +0000
+++ utah/provisioning/baremetal/cobbler.py	2013-02-13 16:47:23 +0000
@@ -20,7 +20,6 @@
 import netifaces
 import os
 import pipes
-import shutil
 import subprocess
 import tempfile
 import time
@@ -107,8 +106,14 @@
             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])
+            result = self._runargs(['sudo', 'mount', '-o', 'loop',
+                                        self.image.image,
+                                        self.isodir])
+            returncode = result['returncode']
+            if returncode != 0:
+                raise UTAHBMProvisioningException(
+                    'Mount failed with return code: {} Output: {}'
+                    .format(returncode, result['output]'))
 
         kernel = self._preparekernel()
         if self.cinitrd is None:
@@ -282,14 +287,14 @@
 
     def _depcheck(self):
         """
-        Check for NFS if installtype is desktop.
+        Check for NFS if installtype requires it.
         """
         super(CobblerMachine, self)._depcheck()
-        if self.installtype == 'desktop':
+        if self.installtype in ['alternate', 'desktop', 'server']:
             cmd = config.nfscommand + ['status']
             if self._runargs(cmd)['returncode'] != 0:
-                raise UTAHBMProvisioningException('NFS needed for desktop'
-                                                  ' install')
+                raise UTAHBMProvisioningException(
+                    'NFS needed for {} install'.format(self.installtype))
             if not os.path.isfile(config.nfsconfigfile):
                 raise UTAHBMProvisioningException(
                     'NFS config file: {nfsconfigfile} not available'