Revert "Improvements to win_feature"
This commit is contained in:
parent
22d25de23c
commit
323a14808f
1 changed files with 48 additions and 61 deletions
|
@ -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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -40,37 +40,33 @@ $restart = Get-Attr $params "restart" $false | ConvertTo-Bool
|
||||||
$includesubfeatures = Get-Attr $params "include_sub_features" $false | ConvertTo-Bool
|
$includesubfeatures = Get-Attr $params "include_sub_features" $false | ConvertTo-Bool
|
||||||
$includemanagementtools = Get-Attr $params "include_management_tools" $false | ConvertTo-Bool
|
$includemanagementtools = Get-Attr $params "include_management_tools" $false | ConvertTo-Bool
|
||||||
|
|
||||||
$name = $name.split(",")
|
|
||||||
|
|
||||||
|
|
||||||
If ($state -eq "present") {
|
If ($state -eq "present") {
|
||||||
try {
|
try {
|
||||||
|
If (Get-Command "Install-WindowsFeature" -ErrorAction SilentlyContinue) {
|
||||||
$featureresult = Add-WindowsFeature -Name $name -Restart:$restart -IncludeAllSubFeature:$includesubfeatures -IncludeManagementTools:$includemanagementtools
|
$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 {
|
||||||
|
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"
|
||||||
|
}
|
||||||
$featureresult = Remove-WindowsFeature -Name $name -Restart:$restart
|
|
||||||
}
|
}
|
||||||
catch {
|
catch {
|
||||||
Fail-Json $result $_.Exception.Message
|
Fail-Json $result $_.Exception.Message
|
||||||
|
@ -81,49 +77,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) {
|
||||||
|
$message = @()
|
||||||
|
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 @{
|
$installed_features += New-Object PSObject -Property @{
|
||||||
id = $item.id.ToString()
|
id = $item.Id
|
||||||
display_name = $item.DisplayName
|
display_name = $item.DisplayName
|
||||||
|
message = $message
|
||||||
message = $item.Message
|
restart_needed = $item.RestartNeeded.ToString() | ConvertTo-Bool
|
||||||
restart_needed = $item.RestartNeeded.ToString()
|
|
||||||
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;
|
|
||||||
|
|
Loading…
Reference in a new issue