diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2018-09-21 12:31:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-21 12:31:15 -0700 |
| commit | 0ac9b2ba55ff1ad5a5426121f9035c0672626e94 (patch) | |
| tree | bcfcdf8e980abe3d2cc40961d852b20d1b923507 | |
| parent | b6940a79359cf60f71a215f3cfebba7ae089cd3a (diff) | |
| parent | c48046d23f75e2d43fc52e2d6e3a5bd9e9f7e320 (diff) | |
| download | chef-0ac9b2ba55ff1ad5a5426121f9035c0672626e94.tar.gz | |
Merge pull request #7673 from chef/fix_ad
Fix failures in windows_ad_join in 14.5.27
| -rw-r--r-- | lib/chef/resource/windows_ad_join.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/resource/windows_ad_join.rb b/lib/chef/resource/windows_ad_join.rb index 2399a5d6d5..cb0f43e9d1 100644 --- a/lib/chef/resource/windows_ad_join.rb +++ b/lib/chef/resource/windows_ad_join.rb @@ -68,7 +68,7 @@ class Chef cmd << "$credential = New-Object System.Management.Automation.PSCredential (\"#{new_resource.domain_user}\",$pswd);" cmd << "Add-Computer -DomainName #{new_resource.domain_name} -Credential $credential" cmd << " -OUPath \"#{new_resource.ou_path}\"" if new_resource.ou_path - cmd << " -NewName \"#{new_resource.new_name}\"" if new_resource.new_name + cmd << " -NewName \"#{new_resource.new_hostname}\"" if new_resource.new_hostname cmd << " -Force" converge_by("join Active Directory domain #{new_resource.domain_name}") do |