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

Fixed dot stuff

Browse source
This commit is contained in:
ShachafGoldstein 2019-06-10 23:51:23 +03:00
parent f91cbf78e0
commit a1d5be00f1
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -19,6 +19,7 @@ rpm-build
*.iml *.iml
#VSCode stuff.. #VSCode stuff..
.vscode/ .vscode/
.favorites.json
# Mac OS X stuff... # Mac OS X stuff...
.DS_Store .DS_Store
# manpage build stuff... # manpage build stuff...

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

@ -307,12 +307,9 @@ if($gather_subset.Contains('memory')) {
if($gather_subset.Contains('platform')) { if($gather_subset.Contains('platform')) {
$win32_cs = Get-LazyCimInstance Win32_ComputerSystem $win32_cs = Get-LazyCimInstance Win32_ComputerSystem
$win32_os = Get-LazyCimInstance Win32_OperatingSystem $win32_os = Get-LazyCimInstance Win32_OperatingSystem
$domainSuffix = $win32_cs.Domain.Substring($win32_cs.Workgroup.length) $domain_suffix = $win32_cs.Domain.Substring($win32_cs.Workgroup.length)
if ($domainSuffix -ne "") $domain_suffix = ".$domain_suffix"
{s
$domainSuffix = ".$domainSuffix"
}
try { try {
$ansible_reboot_pending = Get-PendingRebootStatus $ansible_reboot_pending = Get-PendingRebootStatus
@ -323,12 +320,12 @@ if($gather_subset.Contains('platform')) {
$ansible_facts += @{ $ansible_facts += @{
ansible_architecture = $win32_os.OSArchitecture ansible_architecture = $win32_os.OSArchitecture
ansible_domain = $domainSuffix ansible_domain = $domain_suffix.Substring(1)
ansible_fqdn = ($win32_cs.DNSHostname + "." + $domainSuffix) ansible_fqdn = ($win32_cs.DNSHostname + $domain_suffix)
ansible_hostname = $win32_cs.DNSHostname ansible_hostname = $win32_cs.DNSHostname
ansible_netbios_name = $win32_cs.Name ansible_netbios_name = $win32_cs.Name
ansible_kernel = $osversion.Version.ToString() ansible_kernel = $osversion.Version.ToString()
ansible_nodename = ($win32_cs.DNSHostname + "." + $domainSuffix) ansible_nodename = ($win32_cs.DNSHostname + $domain_suffix)
ansible_machine_id = Get-MachineSid ansible_machine_id = Get-MachineSid
ansible_owner_contact = ([string] $win32_cs.PrimaryOwnerContact) ansible_owner_contact = ([string] $win32_cs.PrimaryOwnerContact)
ansible_owner_name = ([string] $win32_cs.PrimaryOwnerName) ansible_owner_name = ([string] $win32_cs.PrimaryOwnerName)