X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=source%2FBootManager.py;h=32d7ba89669bec83c3f13a6a7d19737ea0566428;hb=7b5214d6358e7aa2599abf78e455dcd0cd96cf96;hp=ab64657e1585299d84ba3b30af189b64df4b63cf;hpb=135271d073a8e7ddfe044ba62c35bb4f7a4676b0;p=bootmanager.git diff --git a/source/BootManager.py b/source/BootManager.py index ab64657..32d7ba8 100755 --- a/source/BootManager.py +++ b/source/BootManager.py @@ -198,7 +198,7 @@ class BootManager: If requriements not met, but tests were succesfull, return 0. for steps that run within the installer, they are expected to either - complete succesfully and return 1, or throw an execption. + complete succesfully and return 1, or throw an exception. For exact return values and expected operations, see the comments at the top of each of the invididual step functions. @@ -234,7 +234,7 @@ class BootManager: # has disappeared (Daniel suggested modules.aliases could be used instead) # and second, in any case it's been years now that modprobe.conf was deprecated # so most likely this code has no actual effect - if vars['virt'] == 'vs': + if self.VARS['virt'] == 'vs': WriteModprobeConfig.Run( self.VARS, self.LOG ) WriteNetworkConfig.Run( self.VARS, self.LOG ) CheckForNewDisks.Run( self.VARS, self.LOG ) @@ -277,6 +277,7 @@ class BootManager: self.VARS['STATE_CHANGE_NOTIFY']= 1 self.VARS['STATE_CHANGE_NOTIFY_MESSAGE']= \ notify_messages.MSG_INSTALL_FINISHED + AnsibleHook.Run( self.VARS, self.LOG ) UpdateBootStateWithPLC.Run( self.VARS, self.LOG ) _bootRun() @@ -289,6 +290,8 @@ class BootManager: if not ConfirmInstallWithUser.Run( self.VARS, self.LOG ): return 0 self.VARS['BOOT_STATE']= 'reinstall' + + AnsibleHook.Run( self.VARS, self.LOG ) _reinstallRun() def _debugRun(state='failboot'):