x/cloudbase-init
Code Issues Proposed changes

Logs license info always in licensing plugin

Browse Source
This commit is contained in:
Alessandro Pilotti 2014-04-30 15:13:40 +03:00
parent 10f416463b
commit bf8b50c1bc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cloudbaseinit/plugins/windows/licensing.py
View File

@ -54,14 +54,14 @@ class WindowsLicensingPlugin(base.BasePlugin):
return out
def execute(self, service, shared_data):
osutils = osutils_factory.get_os_utils()
license_info = self._run_slmgr(osutils, ['/dlv'])
LOG.info('Microsoft Windows license info:\n%s' % license_info)
if CONF.activate_windows:
osutils = osutils_factory.get_os_utils()
license_info = self._run_slmgr(osutils, ['/dlv'])
LOG.info('Microsoft Windows license info:\n%s' % license_info)
LOG.info("Activating Windows")
activation_result = self._run_slmgr(osutils, ['/ato'])
LOG.debug("Activation result:\n%s" % activation_result)
return (base.PLUGIN_EXECUTION_DONE, False)
return (base.PLUGIN_EXECUTION_DONE, False)