From bf8b50c1bc177cd8927ec91613073fed7b012e07 Mon Sep 17 00:00:00 2001 From: Alessandro Pilotti Date: Wed, 30 Apr 2014 15:13:40 +0300 Subject: [PATCH] Logs license info always in licensing plugin --- cloudbaseinit/plugins/windows/licensing.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cloudbaseinit/plugins/windows/licensing.py b/cloudbaseinit/plugins/windows/licensing.py index 8bd3e5d8..ec293073 100644 --- a/cloudbaseinit/plugins/windows/licensing.py +++ b/cloudbaseinit/plugins/windows/licensing.py @@ -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)