Merge lp:~nuclearbob/utah/baremetal-fixes into lp:utah

[Max Brustkern]

I found several minor issues when testing the proposed new stable version on physical hardware. None of these are release blockers, but if we have a chance to approve them today, I can get them tested, and the new stable version will be a little easier to use.

[lp:~nuclearbob/utah/baremetal-fixes]

789. By Max Brustkern on 2012-12-11

Did type->instaltype mapping for arguments

790. By Max Brustkern on 2012-12-11

Fixed typo

[Max Brustkern (nuclearbob)]

I tested this on an i386 raring server image, and it worked. I'm testing with an amd64 desktop image now, but none of the changes should have affected things specific to arch or installtype, so I expect this should be okay.

[Max Brustkern (nuclearbob)]

This works on a quantal amd64 desktop image. I'm testing a raring desktop, but so far it's taking a long time and possible timing out. I'm going to try with something other than the latest daily image in case it's not working correctly.

[Joe Talbott (joetalbott)]

Looks okay to me.

review: Approve

=== modified file 'examples/run_test_cobbler.py'
--- examples/run_test_cobbler.py	2012-12-11 08:41:24 +0000
+++ examples/run_test_cobbler.py	2012-12-11 18:59:29 +0000
@@ -89,20 +89,22 @@
     exitstatus = 0
     machine = None
 
-    for arg in ['arch', 'series', 'type']:
-        if vars(args)[arg] is not None:
-            sys.stderr.write('Automatic image fetch is not yet supported')
-            sys.stderr.write('Please specify an image using the -i option')
-            sys.stderr.write('Local files and http paths are supported')
-            sys.exit(4)
-
     try:
         inventory = ManualBaremetalSQLiteInventory()
         kw = {}
-        for arg in ['boot', 'image', 'preseed', 'rewrite']:
+        for arg in [
+                    'arch',
+                    'boot',
+                    'image',
+                    'preseed',
+                    'rewrite',
+                    'series',
+                   ]:
             value = getattr(args, arg)
             if value is not None:
                 kw[arg] = value
+        if getattr(args, 'type') is not None:
+            kw['installtype'] = args.type
         machine = inventory.request(clean=(not args.no_destroy),
                                     debug=args.debug, dlpercentincrement=10,
                                     name=args.name, new=True, **kw)
 
=== modified file 'utah/provisioning/baremetal/cobbler.py'
--- utah/provisioning/baremetal/cobbler.py	2012-12-11 09:37:12 +0000
+++ utah/provisioning/baremetal/cobbler.py	2012-12-11 18:59:29 +0000
@@ -222,6 +222,8 @@
             else:
                 self.logger.error(error_msg)
                 raise UTAHBMProvisioningException(error_msg)
+        else:
+            return retcode
 
     def _start(self):
         """
 
=== modified file 'utah/provisioning/inventory/sqlite.py'
--- utah/provisioning/inventory/sqlite.py	2012-12-11 09:37:12 +0000
+++ utah/provisioning/inventory/sqlite.py	2012-12-11 18:59:29 +0000
@@ -95,13 +95,13 @@
 
 class ManualBaremetalSQLiteInventory(SQLiteInventory):
     """
-    Keep an inventory of manually entered machines for use with cobbler.
+    Keep an inventory of manually entered machines.
     All columns other than machineid, name, and state are assumed to be
-    arguments for cobbler system creation.
+    arguments for system creation (i.e., with cobbler).
     """
     # TODO: rename this
-    def __init__(self, db='~/.utah-cobbler-inventory',
-                 lockfile='~/.utah-cobbler-lock', *args, **kw):
+    def __init__(self, db='~/.utah-baremetal-inventory',
+                 lockfile='~/.utah-baremetal-lock', *args, **kw):
         db = os.path.expanduser(db)
         lockfile = os.path.expanduser(lockfile)
         if not os.path.isfile(db):
@@ -138,7 +138,7 @@
                 try:
                     if not (psutil.pid_exists(pid) and ('utah' in
                             ' '.join(psutil.Process(pid).cmdline)
-                            or 'run_test_cobbler.py' in
+                            or 'run_test' in
                             ' '.join(psutil.Process(pid).cmdline))):
                         return self._take(machineinfo, *args, **kw)
                 except ValueError: