Merge pull request #8068 from trondhindenes/win_feature_improvements

Updates to the parameters of win_feature

library/windows/win_feature

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- 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
 #
@@ -52,7 +52,23 @@ options:
       - no
     default: null
     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 = '''
@@ -74,4 +90,8 @@ $ ansible -i hosts -m win_feature -a "name=Web-Server,Web-Common-Http" all
         name: "Web-Server"
         state: absent
         restart: yes
+        include_sub_features: yes
+        include_management_tools: yes
+
+
 '''

library/windows/win_feature.ps1

@@ -47,15 +47,34 @@ Elseif (!$params.state) {
 If ($params.restart) {
     $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") {
     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 {
         Fail-Json $result $_.Exception.Message
@@ -63,12 +82,7 @@ If ($state -eq "present") {
 }
 Elseif ($state -eq "absent") {
     try {
-        if ($restart) {
+        $featureresult = Remove-WindowsFeature -Name $name -Restart:$restart
-            $featureresult = Remove-WindowsFeature -Name $name -Restart
-        }
-        else {
-            $featureresult = Remove-WindowsFeature -Name $name
-        }
     }
     catch {
         Fail-Json $result $_.Exception.Message
@@ -78,6 +92,9 @@ Elseif ($state -eq "absent") {
 # Loop through results and create a hash containing details about
 # each role/feature that is installed/removed
 $installed_features = @()
+#$featureresult.featureresult is filled if anything was changed
+if ($featureresult.FeatureResult)
+{
     ForEach ($item in $featureresult.FeatureResult) {
         $installed_features += New-Object psobject @{
             id = $item.id.ToString()
@@ -89,12 +106,17 @@ ForEach ($item in $featureresult.FeatureResult) {
         }
     }
     Set-Attr $result "feature_result" $installed_features
+    
+
+    $result.changed = $true
+}
+Else
+{
+    Set-Attr $result "feature_result" $null
+}
+
 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()
 
-If ($result.feature_result.Length -gt 0) {
-    $result.changed = $true
-}
-
 Exit-Json $result;