improvements to win_feature

reviewable/pr18780/r1
Trond Hindenes 10 years ago
parent 0a33ac418a
commit 8e16962596

@ -1,7 +1,7 @@
#!/usr/bin/python #!/usr/bin/python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# (c) 2014, Paul Durivage <paul.durivage@rackspace.com>, and others # (c) 2014, Paul Durivage <paul.durivage@rackspace.com>, Trond Hindenes <trond@hindenes.com> and others
# #
# This file is part of Ansible # This file is part of Ansible
# #
@ -52,7 +52,23 @@ options:
- no - no
default: null default: null
aliases: [] aliases: []
author: Paul Durivage include_sub_features:
description:
- Adds all subfeatures of the specified feature
choices:
- yes
- no
default: null
aliases: []
include_management_tools:
description:
- Adds the corresponding management tools to the specified feature
choices:
- yes
- no
default: null
aliases: []
author: Paul Durivage / Trond Hindenes
''' '''
EXAMPLES = ''' EXAMPLES = '''
@ -74,4 +90,8 @@ $ ansible -i hosts -m win_feature -a "name=Web-Server,Web-Common-Http" all
name: "Web-Server" name: "Web-Server"
state: absent state: absent
restart: yes restart: yes
include_sub_features: yes
include_management_tools: yes
''' '''

@ -47,15 +47,34 @@ Elseif (!$params.state) {
If ($params.restart) { If ($params.restart) {
$restart = $params.restart | ConvertTo-Bool $restart = $params.restart | ConvertTo-Bool
} }
Else
{
$restart = $false
}
if ($params.include_sub_features)
{
$includesubfeatures = $params.include_sub_features | ConvertTo-Bool
}
Else
{
$includesubfeatures = $false
}
if ($params.include_management_tools)
{
$includemanagementtools = $params.include_management_tools | ConvertTo-Bool
}
Else
{
$includemanagementtools = $false
}
If ($state -eq "present") { If ($state -eq "present") {
try { try {
if ($restart) { $featureresult = Add-WindowsFeature -Name $name -Restart:$restart -IncludeAllSubFeature:$includesubfeatures -IncludeManagementTools:$includemanagementtools
$featureresult = Add-WindowsFeature -Name $name -Restart
}
else {
$featureresult = Add-WindowsFeature -Name $name
}
} }
catch { catch {
Fail-Json $result $_.Exception.Message Fail-Json $result $_.Exception.Message
@ -63,12 +82,7 @@ If ($state -eq "present") {
} }
Elseif ($state -eq "absent") { Elseif ($state -eq "absent") {
try { try {
if ($restart) { $featureresult = Remove-WindowsFeature -Name $name -Restart:$restart
$featureresult = Remove-WindowsFeature -Name $name -Restart
}
else {
$featureresult = Remove-WindowsFeature -Name $name
}
} }
catch { catch {
Fail-Json $result $_.Exception.Message Fail-Json $result $_.Exception.Message

Loading…
Cancel
Save