x/cloudbase-init
Code Issues Proposed changes

Checks for SYSNATIVE folder presence

Browse Source 
Checks for sysnative folder presence instead of the Powershell
subdirectory.

Adds some minor refactory as well.
This commit is contained in:
Alessandro Pilotti 2013-07-06 02:23:25 +03:00
parent 131c884b49
commit c04254a0aa
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cloudbaseinit/plugins/windows/userdata.py
View File

@ -56,20 +56,19 @@ class UserDataPlugin(base.BasePlugin):
'-NonInteractive', target_path]
shell = False
elif re.search(r'^#ps1_sysnative\s', user_data, re.I):
if os.path.isdir(os.path.expandvars("%windir%")
+ "\\sysnative\\WindowsPowerShell\\v1.0\\"):
if os.path.isdir(os.path.expandvars('%windir%\\sysnative')):
target_path += '.ps1'
args = [os.path.expandvars("%windir%")
+ '\\sysnative\\WindowsPowerShell\
\\v1.0\\powershell.exe',
args = [os.path.expandvars('%windir%\\sysnative\\'
'WindowsPowerShell\\v1.0\\'
'powershell.exe'),
'-ExecutionPolicy',
'RemoteSigned', '-NonInteractive', target_path]
shell = False
else:
# Unable to validate sysnative presence
LOG.warning('Unable to validate sysnative folder presence.\
If Target OS is Server 2003, please ensure you have\
KB942589 installed')
LOG.warning('Unable to validate sysnative folder presence. '
'If Target OS is Server 2003, please ensure you '
'have KB942589 installed')
return (base.PLUGIN_EXECUTION_DONE, False)
else:
# Unsupported