valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #31887 from iamseth/develop

Browse Source 
Add next gen win_servermanager execution and state modules for newer Windows minions
This commit is contained in:
Mike Place 2016-03-21 15:47:52 -06:00
commit 5096d33bc3
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
salt/modules/win_servermanager.py
View File

@ -6,6 +6,7 @@ from __future__ import absolute_import
import logging
# Import python libs
from distutils.version import LooseVersion
try:
from shlex import quote as _cmd_quote # pylint: disable=E0611
except ImportError:
@ -124,7 +125,7 @@ def list_installed():
return ret
def install(feature, recurse=False):
def install(feature, recurse=False, restart=False):
'''
Install a feature
@ -140,6 +141,8 @@ def install(feature, recurse=False):
:param bool recurse: Install all sub-features
:param bool restart: Restarts the computer when installation is complete, if required by the role feature installed.
:return: A dictionary containing the results of the install
:rtype: dict
@ -150,13 +153,28 @@ def install(feature, recurse=False):
salt '*' win_servermanager.install Telnet-Client
salt '*' win_servermanager.install SNMP-Service True
'''
# Use Install-WindowsFeature on Windows 8 (osversion 6.2) and later minions. Includes Windows 2012+.
# Default to Add-WindowsFeature for earlier releases of Windows.
# The newer command makes management tools optional so add them for partity with old behavior.
command = 'Add-WindowsFeature'
management_tools = ''
if LooseVersion(__grains__['osversion']) >= LooseVersion('6.2'):
command = 'Install-WindowsFeature'
management_tools = '-IncludeManagementTools'
sub = ''
if recurse:
sub = '-IncludeAllSubFeature'
out = _pshell('Add-WindowsFeature -Name {0} {1} '
rst = ''
if restart:
restart = '-Restart'
out = _pshell('{0} -Name {1} {2} {3} {4} '
'-erroraction silentlycontinue '
'-warningaction silentlycontinue '
'| format-list'.format(_cmd_quote(feature), sub))
'| format-list'.format(command, _cmd_quote(feature), sub, rst, management_tools))
return _parse_powershell_list(out)

7
salt/states/win_servermanager.py
View File

@ -11,7 +11,7 @@ def __virtual__():
return 'win_servermanager' if 'win_servermanager.install' in __salt__ else False
def installed(name, recurse=False, force=False):
def installed(name, recurse=False, force=False, restart=False):
'''
Install the windows feature
@ -25,6 +25,9 @@ def installed(name, recurse=False, force=False):
if the feature is installed but on of its sub-features are not installed set this to True to force
the installation of the sub-features
restart:
Restarts the computer when installation is complete, if restarting is required by the role feature installed.
Note:
Some features require reboot after un/installation. If so, until the server is restarted
other features can not be installed!
@ -62,7 +65,7 @@ def installed(name, recurse=False, force=False):
return ret
# Install the features
ret['changes'] = {'feature': __salt__['win_servermanager.install'](name, recurse)}
ret['changes'] = {'feature': __salt__['win_servermanager.install'](name, recurse, restart)}
if 'Success' in ret['changes']['feature']:
ret['result'] = ret['changes']['feature']['Success'] == 'True'