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

Fix the reboot_required return value (#28579)

Browse source 
As reported in #28565
This commit is contained in:
Dag Wieers 2017-08-24 14:14:14 +02:00 committed by Jordan Borean
parent d8429a69c5
commit d830186e27
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/ansible/modules/windows/win_domain_membership.ps1
View file

@ -235,6 +235,9 @@ Try {
} }
$join_result = Join-Domain @join_args $join_result = Join-Domain @join_args
# this change requires a reboot
$result.reboot_required = $true
} }
ElseIf(-not $hostname_match) { # domain matches but hostname doesn't, just do a rename ElseIf(-not $hostname_match) { # domain matches but hostname doesn't, just do a rename
Write-DebugLog ("domain matches, setting hostname to {0}" -f $hostname) Write-DebugLog ("domain matches, setting hostname to {0}" -f $hostname)
@ -247,10 +250,13 @@ Try {
} }
$rename_result = Rename-Computer @rename_args $rename_result = Rename-Computer @rename_args
# this change requires a reboot
$result.reboot_required = $true
} Else {
# no change is needed
} }
# all these changes require a reboot
$result.reboot_required = $true
} }
Else { Else {
Write-DebugLog "check mode, exiting early..." Write-DebugLog "check mode, exiting early..."
@ -267,11 +273,15 @@ Try {
If(-not $workgroup_match) { If(-not $workgroup_match) {
Write-DebugLog ("setting workgroup to {0}" -f $workgroup_name) Write-DebugLog ("setting workgroup to {0}" -f $workgroup_name)
$join_wg_result = Join-Workgroup -workgroup_name $workgroup_name -domain_admin_user $domain_admin_user -domain_admin_password $domain_admin_password $join_wg_result = Join-Workgroup -workgroup_name $workgroup_name -domain_admin_user $domain_admin_user -domain_admin_password $domain_admin_password
# this change requires a reboot
$result.reboot_required = $true $result.reboot_required = $true
} }
If(-not $hostname_match) { If(-not $hostname_match) {
Write-DebugLog ("setting hostname to {0}" -f $hostname) Write-DebugLog ("setting hostname to {0}" -f $hostname)
$rename_result = Rename-Computer -NewName $hostname $rename_result = Rename-Computer -NewName $hostname
# this change requires a reboot
$result.reboot_required = $true $result.reboot_required = $true
} }
} }