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

setup.ps1 - parity with linux regarding missing local facts path (#58887)

Browse source 
* setup.ps1 - parity with linux regarding missing local facts path

* add warning

* Update setup.ps1-parity-with-linux-regarding-missing-local-facts-path.yml
This commit is contained in:
Shachaf92 2019-11-13 01:05:16 +02:00 committed by Jordan Borean
parent d2e1aeeb67
commit e74d397c01
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/setup.ps1-parity-with-linux-regarding-missing-local-facts-path.yml Normal file
View file

@ -0,0 +1,2 @@
minor_changes:
- "setup.ps1 - parity with linux regarding missing local facts path (https://github.com/ansible/ansible/issues/57974)"

18
lib/ansible/modules/windows/setup.ps1
View file

@ -12,15 +12,17 @@ Function Get-CustomFacts {
$factpath = $null $factpath = $null
) )
if (-not (Test-Path -Path $factpath)) { if (Test-Path -Path $factpath) {
Fail-Json $result "The path $factpath does not exist. Typo?" $FactsFiles = Get-ChildItem -Path $factpath | Where-Object -FilterScript {($PSItem.PSIsContainer -eq $false) -and ($PSItem.Extension -eq '.ps1')}
foreach ($FactsFile in $FactsFiles) {
$out = & $($FactsFile.FullName)
$result.ansible_facts.Add("ansible_$(($FactsFile.Name).Split('.')[0])", $out)
}
} }
else
$FactsFiles = Get-ChildItem -Path $factpath | Where-Object -FilterScript {($PSItem.PSIsContainer -eq $false) -and ($PSItem.Extension -eq '.ps1')} {
Add-Warning $result "Non existing path was set for local facts - $factpath"
foreach ($FactsFile in $FactsFiles) {
$out = & $($FactsFile.FullName)
$result.ansible_facts.Add("ansible_$(($FactsFile.Name).Split('.')[0])", $out)
} }
} }