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

[Max Brustkern]

This branch contains a number of changes I started working on at UDS to simplify and improve the existing bare metal provisioning methods. I'll detail them below.

[Max Brustkern (nuclearbob)]

CobblerMachine now uses the standardized cleanup functions, and removes the machine from cobbler as part of that. I improved some docstrings. I added an option to the _cobbler method of CobblerMachine to not raise an exception on failure for commands that may fail sometimes (i.e. power control and pre-emptively deleting the system info from cobbler.) I removed an old cobbler sync command that has been commented out for a while and the obsolete cobblerfix workaround for the lab. I moved processing of power-related arguments from the two separate machines into a new __init__ function for the PowerMixin. I cleaned up some indentation on exceptions. I changed the pipe involed with uInitrd manipulation to attempt to suppress the standard error of dd.

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

754. By Max Brustkern on 2012-11-27

Removed boot argument since the Machine class handles that now

[Javier Collado (javier.collado)]

pyflakes returns the following problems:
utah/provisioning/baremetal/cobbler.py:70: undefined name 'subprocess'
utah/provisioning/inventory/sqlite.py:138: local variable 'pid' is assigned to but never used

First one should really be fixed.

review: Needs Fixing

[Max Brustkern (nuclearbob)]

Definitely. That's a doozy. I'll go over both of these, and revisit integrating static analysis into my editor, or choosing a new editor that supports it.

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

755. By Max Brustkern on 2012-12-10

Merge default yaml work
Merged latest changes from dev branch

756. By Max Brustkern on 2012-12-10

Resolved pep8 and pyflakes errors

757. By Max Brustkern on 2012-12-10

Moved inventory cleanup after cleanup initialization

758. By Max Brustkern on 2012-12-10

Removing direct interaction with nfsfile since we need sudo for that

[Max Brustkern (nuclearbob)]

I've fixed static analysis errors and tested this with cobbler in magners, and it seems to be working well.

review: Needs Resubmitting

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

759. By Max Brustkern on 2012-12-10

Renamed Cobbler inventory to more genertic Baremetal

[Javier Collado (javier.collado)]

The problems in my previous comment are fixed. Thanks.

(I still need to learn how to test bare metal provisioning at some point).

review: Approve

=== modified file 'examples/run_test_bamboo_feeder.py'
--- examples/run_test_bamboo_feeder.py	2012-12-08 02:10:12 +0000
+++ examples/run_test_bamboo_feeder.py	2012-12-10 20:39:20 +0000
@@ -23,7 +23,7 @@
 from utah.exceptions import UTAHException
 from utah.group import check_user_group, print_group_error_message
 from utah.provisioning.baremetal.bamboofeeder import BambooFeederMachine
-from utah.provisioning.inventory.sqlite import ManualCobblerSQLiteInventory
+from utah.provisioning.inventory.sqlite import ManualBaremetalSQLiteInventory
 from utah.run import run_tests
 from utah.url import url_argument
 
@@ -81,7 +81,7 @@
     machine = None
 
     try:
-        inventory = ManualCobblerSQLiteInventory(
+        inventory = ManualBaremetalSQLiteInventory(
             db=os.path.join('~', '.utah-bamboofeeder-inventory'),
             lockfile=os.path.join('~', '.utah-bamboofeeder-lock'))
         kw = {}

=== modified file 'examples/run_test_cobbler.py'
--- examples/run_test_cobbler.py	2012-12-08 02:10:12 +0000
+++ examples/run_test_cobbler.py	2012-12-10 20:39:20 +0000
@@ -21,7 +21,7 @@
 from utah import config
 from utah.exceptions import UTAHException
 from utah.group import check_user_group, print_group_error_message
-from utah.provisioning.inventory.sqlite import ManualCobblerSQLiteInventory
+from utah.provisioning.inventory.sqlite import ManualBaremetalSQLiteInventory
 from utah.run import run_tests
 from utah.url import url_argument
 
@@ -95,7 +95,7 @@
             sys.exit(4)
 
     try:
-        inventory = ManualCobblerSQLiteInventory()
+        inventory = ManualBaremetalSQLiteInventory()
         kw = {}
         for arg in ['image', 'preseed', 'rewrite']:
             value = vars(args)[arg]

=== modified file 'examples/run_utah_tests.py'
--- examples/run_utah_tests.py	2012-12-08 02:10:12 +0000
+++ examples/run_utah_tests.py	2012-12-10 20:39:20 +0000
@@ -22,7 +22,6 @@
 from utah.url import url_argument
 from utah.group import check_user_group, print_group_error_message
 from utah.timeout import timeout, UTAHTimeout
-from utah import config
 from run_install_test import run_install_test
 
 

=== modified file 'utah/config.py'
--- utah/config.py	2012-12-10 13:01:20 +0000
+++ utah/config.py	2012-12-10 20:39:20 +0000
@@ -99,10 +99,9 @@
     name=None,
     # Default setting of installing a new machine vs. using an existing one
     new=False,
-    # Command to reload NFS configuration
     # NFS options currently only used for cobbler-based desktop installs
-    nfscommand=['sudo', os.path.join('/', 'etc', 'init.d',
-                'nfs-kernel-server'), 'reload'],
+    # NFS service command
+    nfscommand=['sudo', 'service', 'nfs-kernel-server'],
     # Path to NFS config file
     nfsconfigfile=os.path.join('/', 'etc', 'exports'),
     # Default options for NFS shares

=== modified file 'utah/provisioning/baremetal/bamboofeeder.py'
--- utah/provisioning/baremetal/bamboofeeder.py	2012-12-08 02:10:12 +0000
+++ utah/provisioning/baremetal/bamboofeeder.py	2012-12-10 20:39:20 +0000
@@ -39,30 +39,20 @@
     """
     Provide a class to provision an ARM board from a bamboo-feeder setup.
     """
-    def __init__(self, cargs=None, inventory=None, name=None, powercmd=None,
+    def __init__(self, inventory=None, machineinfo=None, name=None,
                  preboot=None, *args, **kw):
         # TODO: change the name of cargs here and elsewhere
         # TODO: respect rewrite setting
         if name is None:
             raise UTAHBMProvisioningException(
                 'Machine name reqired for bamboo-feeder machine')
-        if powercmd is not None:
-            self.powercmd = powercmd
-        elif cargs is not None:
-            self.power = {}
-            for item in cargs:
-                if 'power' in item:
-                    self.power[item] = cargs[item]
-        else:
-            raise UTAHBMProvisioningException(
-                'No power control information specified')
         try:
-            self.macaddress = cargs['mac-address']
+            self.macaddress = machineinfo['mac-address']
         except AttributeError:
-            raise UTAHBMProvisioningException(
-                'No MAC address specified')
+            raise UTAHBMProvisioningException('No MAC address specified')
         self.inventory = inventory
-        super(BambooFeederMachine, self).__init__(*args, name=name, **kw)
+        super(BambooFeederMachine, self).__init__(*args,
+            machineinfo=machineinfo, name=name, **kw)
         if self.inventory is not None:
             self.cleanfunction(self.inventory.release, machine=self)
         self._depcheck()
@@ -147,10 +137,10 @@
         headersize = filesize - datasize
         self.logger.debug('uInitrd header size is ' + str(headersize))
         pipe = pipes.Template()
-        pipe.prepend('dd if=$IN bs=1 skip=' + str(headersize), 'f-')
+        pipe.prepend('dd if=$IN bs=1 skip=' + str(headersize) +
+                     ' 2>/dev/null', 'f-')
         pipe.append('gunzip', '--')
         pipe.append('cpio -ivd 2>/dev/null', '-.')
-        # TODO: suppress dd output
         pipe.copy(self.initrd, '/dev/null')
 
     def _repackinitrd(self):
@@ -293,15 +283,7 @@
 
         self.provisioned = True
         self.active = True
-        # TODO: Make this a method that this and CobblerMachine can call
-        uuid_check_command = ('[ "{uuid}" == "$(cat /etc/utah/uuid)" ]'
-                              .format(uuid=self.uuid))
-        if self.run(uuid_check_command)[0] != 0:
-            self.provisioned = False
-            raise UTAHBMProvisioningException(
-                'Installed UUID differs from Machine UUID; '
-                'installation probably failed. '
-                'Try restarting cobbler or running cobbler sync')
+        self._uuid_check()
         self.logger.info('System installed')
         self.cleanfunction(self.run, (
             'dd', 'bs=512k', 'count=10', 'if=/dev/zero', 'of=/dev/mmcblk0'),

=== modified file 'utah/provisioning/baremetal/cobbler.py'
--- utah/provisioning/baremetal/cobbler.py	2012-12-08 02:10:12 +0000
+++ utah/provisioning/baremetal/cobbler.py	2012-12-10 20:39:20 +0000
@@ -21,6 +21,7 @@
 import os
 import pipes
 import shutil
+import subprocess
 import tempfile
 import time
 
@@ -39,31 +40,28 @@
     """
     Provide a class to provision a machine via cobbler.
     """
-    # TODO: may need to fix DHCP/hostname issues, may just be magners
-    def __init__(self, cargs=None, inventory=None, name=None, preseed=None,
-                 *args, **kw):
+    def __init__(self, inventory=None, machineinfo=None,
+                 name=None, *args, **kw):
+        # TODO: support for reusing existing machines
         if name is None:
             raise UTAHBMProvisioningException(
                 'Machine name reqired for cobbler machine')
-        if cargs is None:
+        if machineinfo is None:
             raise UTAHBMProvisioningException(
                 'No cobbler arguments given for machine creation')
         else:
-            self.cargs = cargs
+            self.machineinfo = machineinfo
         self.power = {}
-        for item in cargs:
-            if 'power' in item:
-                self.power[item] = cargs[item]
         self.inventory = inventory
-        if preseed is None:
-            preseed = '/etc/utah/default-preseed.cfg'
-        super(CobblerMachine, self).__init__(*args, name=name,
-                                             preseed=preseed, **kw)
+        super(CobblerMachine, self).__init__(*args, machineinfo=machineinfo,
+                                             name=name, **kw)
+        if self.inventory is not None:
+            self.cleanfunction(self.inventory.release, machine=self)
         if self.image is None:
             raise UTAHBMProvisioningException(
                 'Image file required for cobbler installation')
         self._custominit()
-        # TODO: verify we have nfs support for desktop image
+        self._depcheck()
 
         # TODO: Rework cinitrd to be less of a confusing collection of kludges
         self.cinitrd = None
@@ -79,13 +77,27 @@
         self.logger.debug('Cobbler arch is ' + self.carch)
         self.logger.debug('Cobbler machine init finished')
 
-    def _provision(self, checktimeout=config.checktimeout,
+    def _load(self):
+        """
+        Verify the machine is in cobbler.
+        """
+        # TODO: consider reworking _cobble to provide this
+        # (only if we'll be using cobbler for a while longer)
+        machines = subprocess.check_output(['sudo', 'cobbler', 'system',
+                                            'find']).splitlines()
+        if self.name not in machines:
+            raise UTAHBMProvisioningException('No machine named ' + self.name
+                                              + ' exists in cobbler')
+        else:
+            return True
+
+    def _create(self, checktimeout=config.checktimeout,
                    installtimeout=config.installtimeout):
         """
         Install a machine.
         """
-        # TODO: support for reusing existing machines
         self.tmpdir = tempfile.mkdtemp(prefix='/tmp/' + self.name + '_')
+        self.cleanfile(self.tmpdir)
         os.chdir(self.tmpdir)
 
         # TODO: try to remove this step, mount the iso and import that
@@ -102,6 +114,7 @@
         initrd = self._prepareinitrd(initrd=cinitrd)
         self._unpackinitrd(initrd=initrd)
         self._setuplatecommand()
+        # TODO: see if this is needed for all quantal desktops
         if self.installtype == 'desktop':
             self.logger.info('Configuring latecommand for desktop')
             myfile = open(os.path.join(self.tmpdir, 'initrd.d',
@@ -118,18 +131,12 @@
             shutil.copyfile(initrd, cinitrd)
 
         self.logger.info('Setting up system with cobbler')
-        self.logger.debug('Removing old system')
-        self._cobble(['system', 'remove', '--name=' + self.name])
-        self.logger.info('Removing old profile')
-        self._cobble(['profile', 'remove', '--name=' + self.cname])
-        self.logger.info('Removing old distro')
-        self._cobble(['distro', 'remove', '--name=' + self.cname])
+        self._cleanupcobbler()
 
         preseed = os.path.join(self.tmpdir, 'initrd.d', 'preseed.cfg')
 
         if self.installtype in ['alternate', 'server']:
-            # TODO: support more image types,
-            # maybe do this without unpacking ISO
+            # TODO: maybe do this without unpacking ISO
             self.logger.info('Importing image')
             self._cobble(['import', '--name=' + self.cname,
                           '--path=' + self.tmpdir, '--arch=' + self.carch])
@@ -144,16 +151,14 @@
         if self.installtype == 'desktop':
             self.logger.info('Setting up NFS for desktop install')
             self.logger.debug('Adding export to NFS config file')
-#            nfsfile = open(config.nfsconfigfile, 'a')
-#            nfsfile.write("\n" + self.tmpdir + ' ' + config.nfsoptions + "\n")
-#            nfsfile.close()
+            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 + ' ' +
                                               config.nfsoptions + "\n")
             self.logger.debug('Reloading NFS config')
-            self._runargs(config.nfscommand)
+            self._runargs(config.nfscommand + ['reload'])
             self.logger.debug('Adding NFS boot options')
             try:
                 iface = config.nfsiface
@@ -164,6 +169,7 @@
                              ip + ':' + self.tmpdir)
             self.cmdline = self.cmdline.strip()
 
+        self.cleanfunction(self._cleanupcobbler)
         self.logger.info('Adding kernel boot options to distro')
         self._cobble(['distro', 'edit', '--name=' + self.cname,
                       '--kopts=' + self.cmdline])
@@ -175,17 +181,9 @@
         self.logger.info('Adding system')
         self._cobble(['system', 'add', '--name=' + self.name,
                       '--profile=' + self.cname, '--netboot-enabled=Y']
-                     + ['--' + arg + '=' + self.cargs[arg]
-                        for arg in self.cargs])
+                     + ['--' + arg + '=' + self.machineinfo[arg]
+                        for arg in self.machineinfo])
 
-        # Things seem to be working fine without this,
-        # but sometimes things still get broken
-        #self.logger.info('Syncing cobbler')
-        #self._cobble(['sync'])
-        try:
-            self._runargs(config.cobblerfix)
-        except AttributeError:
-            pass
         self.restart()
 
         self.logger.info('Waiting for installation to begin')
@@ -204,45 +202,26 @@
             self.logger.info('Removing NFS share')
             self._removenfs()
 
-        if self.debug:
-            self.logger.info('Leaving temp directory '
-                             'because debug is enabled: ' + self.tmpdir)
-        else:
-            self.logger.info('Cleaning up temp directory')
-            self._cleanuptmpdir()
-
         self.provisioned = True
         self.active = True
-        uuid_check_command = ('[ "{uuid}" == "$(cat /etc/utah/uuid)" ]'
-                              .format(uuid=self.uuid))
-        if self.run(uuid_check_command)[0] != 0:
-            self.provisioned = False
-            raise UTAHBMProvisioningException(
-                'Installed UUID differs from CobblerMachine UUID; '
-                'installation probably failed. '
-                'Try restarting cobbler or running cobbler sync')
+        self._uuid_check()
         self.logger.info('System installed')
         return True
 
-    def destroy(self, *args, **kw):
-        """
-        Destroy the machine, and call super to release it in the inventory.
-        """
-        # TODO: Remove the machine from cobbler
-        # TODO: Consider actually wrecking the install
-        super(CobblerMachine, self).destroy(*args, **kw)
-        self.__del__()
-        del self
-
-    def _cobble(self, cmd):
+    def _cobble(self, cmd, failok=False):
         """
         Pull out all cobbler commands so that we can later support changing
         users, remote login, not sudo, etc.
         """
-        if self._runargs(['sudo', 'cobbler'] + cmd) != 0:
+        retcode = self._runargs(['sudo', 'cobbler'] + cmd)
+        if retcode != 0:
             error_msg = 'Cobbler command failed: ' + ' '.join(cmd)
-            self.logger.error(error_msg)
-            raise UTAHBMProvisioningException(error_msg)
+            if failok:
+                self.logger.debug(error_msg)
+                return retcode
+            else:
+                self.logger.error(error_msg)
+                raise UTAHBMProvisioningException(error_msg)
 
     def _start(self):
         """
@@ -250,9 +229,11 @@
         If that fails, use the powercommand generated by PowerMachine.
         """
         self.logger.debug('Starting system')
-        try:
-            self._cobble(['system', 'poweron', '--name=' + self.name])
-        except UTAHBMProvisioningException:
+        retcode = self._cobble(['system', 'poweron', '--name=' + self.name],
+                               failok=True)
+        if retcode != 0:
+            self.logger.info('Cobbler power command failed; falling back to '
+                             'manual command')
             self._runargs(self.powercommand() + ['on'])
         self.active = True
 
@@ -262,52 +243,46 @@
         If that fails, use the powercommand generated by PowerMachine.
         """
         self.logger.debug('Stopping system')
-        try:
-            self._cobble(['system', 'poweroff', '--name=' + self.name])
-        except UTAHBMProvisioningException:
+        retcode = self._cobble(['system', 'poweroff', '--name=' + self.name],
+                               failok=True)
+        if retcode != 0:
+            self.logger.info('Cobbler power command failed; falling back to '
+                             'manual command')
             self._runargs(self.powercommand() + ['off'])
         self.active = False
 
-    def __del__(self):
-        """
-        If the machine has an inventory, tell the inventory to release the
-        machine when the object is deleted.
-        If we exported a directory over NFS, remove it.
-        """
-        if self.installtype == 'desktop':
-            self._removenfs()
-        if not self.debug:
-            self._cleanuptmpdir()
-        if self.inventory is not None:
-            self.inventory.release(machine=self)
-
     def _removenfs(self):
+        """
+        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)
-
-    def _cleanuptmpdir(self):
-        if os.path.isdir(self.tmpdir):
-            # Cribbed from http://svn.python.org
-            # /projects/python/trunk/Mac/BuildScript/build-installer.py
-            for dirpath, dirnames, filenames in os.walk(self.tmpdir):
-                for name in (dirnames + filenames):
-                    absolute_name = os.path.join(dirpath, name)
-                    if not os.path.islink(absolute_name):
-                        self.logger.debug('Changing permissions of '
-                                          + absolute_name)
-                        os.chmod(absolute_name, 0775)
-            shutil.rmtree(self.tmpdir)
-
-    def activecheck(self):
-        """
-        Start the machine if needed, and check for SSH login.
-        """
-        # TODO: Consider moving this to SSHMixin
-        self.logger.debug('Checking if machine is active')
-        self.provisioncheck()
-        if not self.active:
-            self._start()
-            self.sshcheck()
+        self._runargs(config.nfscommand + ['reload'])
+
+    def _depcheck(self):
+        """
+        Check for NFS if installtype is desktop.
+        """
+        super(CobblerMachine, self)._depcheck()
+        if self.installtype == 'desktop':
+            cmd = config.nfscommand + ['status']
+            if self._runargs(cmd) != 0:
+                raise UTAHBMProvisioningException('NFS needed for desktop'
+                                                  ' install')
+            if not os.path.isfile(config.nfsconfigfile):
+                raise UTAHBMProvisioningException('NFS config file: ' +
+                        config.nfsconfigfile + ' not available')
+
+    def _cleanupcobbler(self):
+        """
+        Remove our system, profile, and distro from Cobbler.
+        """
+        self.logger.debug('Removing old system')
+        self._cobble(['system', 'remove', '--name=' + self.name], failok=True)
+        self.logger.info('Removing old profile')
+        self._cobble(['profile', 'remove', '--name=' + self.cname],
+                     failok=True)
+        self.logger.info('Removing old distro')
+        self._cobble(['distro', 'remove', '--name=' + self.cname], failok=True)

=== modified file 'utah/provisioning/baremetal/power.py'
--- utah/provisioning/baremetal/power.py	2012-12-08 02:10:12 +0000
+++ utah/provisioning/baremetal/power.py	2012-12-10 20:39:20 +0000
@@ -28,7 +28,23 @@
     """
     Provide power cycle commands for the Sentry CDU.
     """
+    def __init__(self, machineinfo=None, powercmd=None, *args, **kw):
+        """
+        Store power control info for later use.
+        """
+        if powercmd is not None:
+            self.powercmd = powercmd
+        elif machineinfo is not None:
+            self.power = {}
+            for item in machineinfo:
+                if 'power' in item:
+                    self.power[item] = machineinfo[item]
+        super(PowerMixin, self).__init__(*args, **kw)
+
     def powercommand(self):
+        """
+        Return the command used to control power for this machine.
+        """
         try:
             cmd = self.powercmd
         except AttributeError:
@@ -41,9 +57,8 @@
                            '-p', self.power['power-pass'],
                            '-o']
                 else:
-                    raise UTAHProvisioningException('Power type ' +
-                                                    self.power['power-type'] +
-                                                    ' not supported')
+                    raise UTAHBMProvisioningException('Power type ' +
+                        self.power['power-type'] + ' not supported')
             except AttributeError:
                 raise UTAHBMProvisioningException('Power commands not defined'
                                                   ' for this machine')

=== modified file 'utah/provisioning/inventory/sqlite.py'
--- utah/provisioning/inventory/sqlite.py	2012-12-08 02:10:12 +0000
+++ utah/provisioning/inventory/sqlite.py	2012-12-10 20:39:20 +0000
@@ -93,7 +93,7 @@
             return False
 
 
-class ManualCobblerSQLiteInventory(SQLiteInventory):
+class ManualBaremetalSQLiteInventory(SQLiteInventory):
     """
     Keep an inventory of manually entered machines for use with cobbler.
     All columns other than machineid, name, and state are assumed to be
@@ -107,7 +107,7 @@
         if not os.path.isfile(db):
             raise UTAHProvisioningInventoryException(
                 'No machine database found at ' + db)
-        super(ManualCobblerSQLiteInventory, self).__init__(*args, db=db,
+        super(ManualBaremetalSQLiteInventory, self).__init__(*args, db=db,
                                                            lockfile=lockfile,
                                                            **kw)
         machines_count = (self.connection
@@ -128,37 +128,37 @@
             raise UTAHProvisioningInventoryException(
                 'No machines meet criteria')
         else:
-            for machineinfo in result:
-                cargs = dict(machineinfo)
-                if cargs['state'] == 'available':
-                    return self._take(cargs, *args, **kw)
-            for machineinfo in result:
-                cargs = dict(machineinfo)
-                pid = cargs['pid']
+            for minfo in result:
+                machineinfo = dict(minfo)
+                if machineinfo['state'] == 'available':
+                    return self._take(machineinfo, *args, **kw)
+            for minfo in result:
+                machineinfo = dict(minfo)
+                pid = machineinfo['pid']
                 try:
                     if not (psutil.pid_exists(pid) and ('utah' in
                             ' '.join(psutil.Process(pid).cmdline)
                             or 'run_test_cobbler.py' in
                             ' '.join(psutil.Process(pid).cmdline))):
-                        return self._take(cargs, *args, **kw)
+                        return self._take(machineinfo, *args, **kw)
                 except ValueError:
                     continue
 
         raise UTAHProvisioningInventoryException(
             'All machines meeting criteria are currently unavailable')
 
-    def _take(self, cargs, *args, **kw):
-        machineid = cargs.pop('machineid')
-        name = cargs.pop('name')
-        state = cargs.pop('state')
-        pid = cargs.pop('pid')
+    def _take(self, machineinfo, *args, **kw):
+        machineid = machineinfo.pop('machineid')
+        name = machineinfo.pop('name')
+        state = machineinfo.pop('state')
+        machineinfo.pop('pid')
         update = self.connection.execute(
             "UPDATE machines SET pid=?, state='provisioned' WHERE machineid=?"
             "AND state=?",
             [os.getpid(), machineid, state]).rowcount
         if update == 1:
-            machine = CobblerMachine(*args, cargs=cargs,
-                                     inventory=self, name=name, **kw)
+            machine = CobblerMachine(*args, inventory=self,
+                                     machineinfo=machineinfo, name=name, **kw)
             self.machines.append(machine)
             return machine
         elif update == 0:

=== modified file 'utah/provisioning/provisioning.py'
--- utah/provisioning/provisioning.py	2012-12-06 16:30:34 +0000
+++ utah/provisioning/provisioning.py	2012-12-10 20:39:20 +0000
@@ -454,12 +454,12 @@
         from libvirt if it is registered there.
         For a physical machine, this should free it up to be used by another
         process in the future, and destroy sensitive data if any exists.
-        Destroying the install on a physical machine is optional, but it
-        should be powered off if remote power management is available.
-        Now returns False by default to work with multiple inheritance.
+        Destroying the install on a physical machine is optional.
         """
+        self.provisioned = False
         self.__del__()
         del self
+        return True
 
     def _load(self):
         """
@@ -664,6 +664,16 @@
     def __del__(self):
         self.cleanup()
 
+    def _uuid_check(self):
+        uuid_check_command = ('[ "{uuid}" == "$(cat /etc/utah/uuid)" ]'
+                              .format(uuid=self.uuid))
+        if self.run(uuid_check_command)[0] != 0:
+            self.provisioned = False
+            raise UTAHProvisioningException(
+                    'Installed UUID differs from Machine UUID; '
+                    'installation probably failed. '
+                    'Try rerunning install.')
+
 
 class SSHMixin(object):
     """
@@ -885,6 +895,16 @@
         utah.timeout.timeout(timeout, retry, self.sshcheck, checktimeout,
                              logmethod=logmethod)
 
+    def activecheck(self):
+        """
+        Start the machine if needed, and check for SSH login.
+        """
+        self.logger.debug('Checking if machine is active')
+        self.provisioncheck()
+        if not self.active:
+            self._start()
+            self.sshcheck()
+
 
 class CustomInstallMixin(object):
     """