wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

win_domain - fix for checking for domain on new host (#55195)

Browse source 
(cherry picked from commit 6039ff9a24)
This commit is contained in:
Jordan Borean 2019-04-12 14:14:49 +10:00 committed by Toshio Kuratomi
parent 3117495d43
commit 455aa542d0
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/win_domain-setup.yaml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- win_domain - Fix checking for a domain introduced in a recent patch

3
lib/ansible/modules/windows/win_domain.ps1
View file

@ -74,7 +74,8 @@ try {
# Cannot use Get-ADForest as that requires credential delegation, the below does not
$forest_context = New-Object -TypeName System.DirectoryServices.ActiveDirectory.DirectoryContext -ArgumentList Forest, $dns_domain_name
$forest = [System.DirectoryServices.ActiveDirectory.Forest]::GetForest($forest_context)
} catch [System.DirectoryServices.ActiveDirectory.ActiveDirectoryObjectNotFoundException] { }
} catch [System.DirectoryServices.ActiveDirectory.ActiveDirectoryObjectNotFoundException] {
} catch [System.DirectoryServices.ActiveDirectory.ActiveDirectoryOperationException] { }
if (-not $forest) {
$result.changed = $true