Merge pull request ansible#8833 from jhawkesworth/win_facts_powershel…

…l_version_and_winrm_cert_expiry_revised Revised additions to windows facts
hughdbrown · Aug 31, 2014 · b068155 · b068155
2 parents 69e7999 + e4b80dd
commit b068155
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/library/windows/setup.ps1 b/library/windows/setup.ps1
@@ -66,4 +66,13 @@ $ips = @()
 Foreach ($ip in $netcfg.IPAddress) { If ($ip) { $ips += $ip } }
 Set-Attr $result.ansible_facts "ansible_ip_addresses" $ips
 
+$psversion = $PSVersionTable.PSVersion.Major
+$winrm_cert_expiry = Get-ChildItem -Path Cert:\LocalMachine\My | where Subject -EQ "CN=$env:COMPUTERNAME" | select NotAfter
+
+Set-Attr $result.ansible_facts "ansible_powershell_version" $psversion
+if ($winrm_cert_expiry) 
+{
+    Set-Attr $result.ansible_facts "ansible_winrm_certificate_expires" $winrm_cert_expiry.NotAfter.ToString("yyyy-MM-dd HH:mm:ss")
+}
+
 Exit-Json $result;