summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAirCombat <3476396+AirCombat@users.noreply.github.com>2020-02-04 04:52:24 +0000
committerGitHub <noreply@github.com>2020-02-04 14:52:24 +1000
commit81378b3e744cd0d13b33d18a4f8a38aeb8a6e97a (patch)
tree0fafc8f34da7373255a9883ee0871e15d3f1ac0d
parent6d792838e49103bef076d5c4807e92a2cfc71015 (diff)
downloadansible-81378b3e744cd0d13b33d18a4f8a38aeb8a6e97a.tar.gz
Added -LogPath param from Install-ADDSForest to win_domain module (#66956)
* Added omitted logpath parameter to win_domain The Install-ADDSForest -LogPath param seems to have been omitted in the win_domain module. We do not use this module organisation-wide as its non trivial to change the log patch once AD is set up. I will also update docs * Removed trailing whitespace * Added logpath option to win_domain module docs
-rw-r--r--lib/ansible/modules/windows/win_domain.ps15
-rw-r--r--lib/ansible/modules/windows/win_domain.py6
2 files changed, 11 insertions, 0 deletions
diff --git a/lib/ansible/modules/windows/win_domain.ps1 b/lib/ansible/modules/windows/win_domain.ps1
index 9f075a0ce3..a5ec083e0b 100644
--- a/lib/ansible/modules/windows/win_domain.ps1
+++ b/lib/ansible/modules/windows/win_domain.ps1
@@ -31,6 +31,7 @@ $domain_netbios_name = Get-AnsibleParam -obj $params -name "domain_netbios_name"
$safe_mode_admin_password = Get-AnsibleParam -obj $params -name "safe_mode_password" -failifempty $true
$database_path = Get-AnsibleParam -obj $params -name "database_path" -type "path"
$sysvol_path = Get-AnsibleParam -obj $params -name "sysvol_path" -type "path"
+$log_path = Get-AnsibleParam -obj $params -name "log_path" -type "path"
$create_dns_delegation = Get-AnsibleParam -obj $params -name "create_dns_delegation" -type "bool"
$domain_mode = Get-AnsibleParam -obj $params -name "domain_mode" -type "str"
$forest_mode = Get-AnsibleParam -obj $params -name "forest_mode" -type "str"
@@ -103,6 +104,10 @@ if (-not $forest) {
$install_params.SysvolPath = $sysvol_path
}
+ if ($log_path) {
+ $install_params.LogPath = $log_path
+ }
+
if ($domain_netbios_name) {
$install_params.DomainNetBiosName = $domain_netbios_name
}
diff --git a/lib/ansible/modules/windows/win_domain.py b/lib/ansible/modules/windows/win_domain.py
index 54d77104b8..e05f585cea 100644
--- a/lib/ansible/modules/windows/win_domain.py
+++ b/lib/ansible/modules/windows/win_domain.py
@@ -41,6 +41,12 @@ options:
- If not set then the default path is C(%SYSTEMROOT%\NTDS).
type: path
version_added: '2.5'
+ log_path:
+ description:
+ - Specifies the fully qualified, non-UNC path to a directory on a fixed disk of the local computer where the log file for this operation is written.
+ - If not set then the default path is C(%SYSTEMROOT%\NTDS).
+ type: path
+ version_added: '2.10'
sysvol_path:
description:
- The path to a directory on a fixed disk of the Windows host where the