cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update win_feature module to work on server 2008 and fail with error message on non-server windows, fix output messages and error handling.

Browse source
This commit is contained in:
Chris Church 2014-09-30 16:41:34 -04:00 committed by Matt Clay
parent c81c192dcb
commit 262624ca12
1 changed files with 48 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
lib/ansible/modules/windows/win_feature.ps1
View file

@ -23,7 +23,7 @@ Import-Module Servermanager;
$params = Parse-Args $args; $params = Parse-Args $args;
$result = New-Object psobject @{ $result = New-Object PSObject -Property @{
changed = $false changed = $false
} }
@ -70,19 +70,33 @@ Else
$includemanagementtools = $false $includemanagementtools = $false
} }
If ($state -eq "present") { If ($state -eq "present") {
try { try {
$featureresult = Add-WindowsFeature -Name $name -Restart:$restart -IncludeAllSubFeature:$includesubfeatures -IncludeManagementTools:$includemanagementtools If (Get-Command "Install-WindowsFeature" -ErrorAction SilentlyContinue) {
$featureresult = Install-WindowsFeature -Name $name -Restart:$restart -IncludeAllSubFeature:$includesubfeatures -IncludeManagementTools:$includemanagementtools -ErrorAction SilentlyContinue
}
ElseIf (Get-Command "Add-WindowsFeature" -ErrorAction SilentlyContinue) {
$featureresult = Add-WindowsFeature -Name $name -Restart:$restart -IncludeAllSubFeature:$includesubfeatures -ErrorAction SilentlyContinue
}
Else {
Fail-Json $result "Not supported on this version of Windows"
}
} }
catch { catch {
Fail-Json $result $_.Exception.Message Fail-Json $result $_.Exception.Message
} }
} }
Elseif ($state -eq "absent") { ElseIf ($state -eq "absent") {
try { try {
$featureresult = Remove-WindowsFeature -Name $name -Restart:$restart If (Get-Command "Uninstall-WindowsFeature" -ErrorAction SilentlyContinue) {
$featureresult = Uninstall-WindowsFeature -Name $name -Restart:$restart -ErrorAction SilentlyContinue
}
ElseIf (Get-Command "Remove-WindowsFeature" -ErrorAction SilentlyContinue) {
$featureresult = Remove-WindowsFeature -Name $name -Restart:$restart -ErrorAction SilentlyContinue
}
Else {
Fail-Json $result "Not supported on this version of Windows"
}
} }
catch { catch {
Fail-Json $result $_.Exception.Message Fail-Json $result $_.Exception.Message
@ -93,30 +107,40 @@ Elseif ($state -eq "absent") {
# each role/feature that is installed/removed # each role/feature that is installed/removed
$installed_features = @() $installed_features = @()
#$featureresult.featureresult is filled if anything was changed #$featureresult.featureresult is filled if anything was changed
if ($featureresult.FeatureResult) If ($featureresult.FeatureResult)
{ {
ForEach ($item in $featureresult.FeatureResult) { ForEach ($item in $featureresult.FeatureResult) {
$installed_features += New-Object psobject @{ $message = @()
id = $item.id.ToString() ForEach ($msg in $item.Message) {
$message += New-Object PSObject -Property @{
message_type = $msg.MessageType.ToString()
error_code = $msg.ErrorCode
text = $msg.Text
}
}
$installed_features += New-Object PSObject -Property @{
id = $item.Id
display_name = $item.DisplayName display_name = $item.DisplayName
message = $item.Message.ToString() message = $message
restart_needed = $item.RestartNeeded.ToString() restart_needed = $item.RestartNeeded.ToString() | ConvertTo-Bool
skip_reason = $item.SkipReason.ToString() skip_reason = $item.SkipReason.ToString()
success = $item.Success.ToString() success = $item.Success.ToString() | ConvertTo-Bool
} }
} }
Set-Attr $result "feature_result" $installed_features
$result.changed = $true $result.changed = $true
} }
Else
{ Set-Attr $result "feature_result" $installed_features
Set-Attr $result "feature_result" $null Set-Attr $result "success" ($featureresult.Success.ToString() | ConvertTo-Bool)
Set-Attr $result "exitcode" $featureresult.ExitCode.ToString()
Set-Attr $result "restart_needed" ($featureresult.RestartNeeded.ToString() | ConvertTo-Bool)
If ($result.success) {
Exit-Json $result
}
ElseIf ($state -eq "present") {
Fail-Json $result "Failed to add feature"
}
Else {
Fail-Json $result "Failed to remove feature"
} }
Set-Attr $result "feature_success" $featureresult.Success.ToString()
Set-Attr $result "feature_exitcode" $featureresult.ExitCode.ToString()
Set-Attr $result "feature_restart_needed" $featureresult.RestartNeeded.ToString()
Exit-Json $result;