Merge lp:~doanac/utah/bug1172495 into lp:utah

[Andy Doan]

this should fix the regression I caused.

tested on:
 alderamin: desktop and server vm's
 magners: desktop and server iso on veriton-04

[Max Brustkern (nuclearbob)]

I almost wonder if uuid check should come before setting provisioned to True? It probably doesn't make a difference since failing the uuid check will raise an Exception anyway.

[Andy Doan (doanac)]

On 04/25/2013 01:27 PM, Max Brustkern wrote:
> I almost wonder if uuid check should come before setting provisioned to True? It probably doesn't make a difference since failing the uuid check will raise an Exception anyway.

The problem is that uuid_check uses "run" which in practice uses ssh
which checks if provisioned=True. I think I have a cleaner idea, i'm
going to try where we get the UUID via rsyslog. Testing the patch(es) today.

[Max Brustkern (nuclearbob)]

That makes a sense. The current version works for me, but if you're planning something else, I can look at that.

review: Approve

=== modified file 'utah/provisioning/baremetal/bamboofeeder.py'
--- utah/provisioning/baremetal/bamboofeeder.py	2013-04-18 17:17:45 +0000
+++ utah/provisioning/baremetal/bamboofeeder.py	2013-04-25 16:49:32 +0000
@@ -285,7 +285,6 @@
               retry_timeout=config.checktimeout)
 
         self.active = True
-        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	2013-04-18 17:48:44 +0000
+++ utah/provisioning/baremetal/cobbler.py	2013-04-25 16:49:32 +0000
@@ -217,7 +217,6 @@
             self._removenfs()
 
         self.active = True
-        self._uuid_check()
         self.logger.info('System installed')
 
     def _disable_netboot(self, match):

=== modified file 'utah/provisioning/provisioning.py'
--- utah/provisioning/provisioning.py	2013-04-24 11:37:21 +0000
+++ utah/provisioning/provisioning.py	2013-04-25 16:49:32 +0000
@@ -411,6 +411,7 @@
                 self.logger.debug('Failed to load machine: %s', str(err))
         self._create()
         self.provisioned = True
+        self._uuid_check()
 
     def _create(self):
         # TODO: discuss separation of this vs. start when separating Install