summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Preston <stuart@chef.io>2018-11-09 14:04:35 +0000
committerStuart Preston <stuart@chef.io>2018-11-09 14:04:35 +0000
commit53f2356098a80c0b06e7799180886f104661bf96 (patch)
tree97518fa8d869c1f612f4459995984c5809fa50e7
parenta279ba13fb2935d3a0ff092b1fb557eaaf2cc9c4 (diff)
downloadchef-sp/fix7715-chef-14.tar.gz
windows_ad_join: Switch to UPN format usernames for use with AD cmdletssp/fix7715-chef-14
Signed-off-by: Stuart Preston <stuart@chef.io>
-rw-r--r--lib/chef/resource/windows_ad_join.rb2
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 645dab5ad0..b3acacc703 100644
--- a/lib/chef/resource/windows_ad_join.rb
+++ b/lib/chef/resource/windows_ad_join.rb
@@ -65,7 +65,7 @@ class Chef
unless on_domain?
cmd = "$pswd = ConvertTo-SecureString \'#{new_resource.domain_password}\' -AsPlainText -Force;"
- cmd << "$credential = New-Object System.Management.Automation.PSCredential (\"#{new_resource.domain_user}\",$pswd);"
+ cmd << "$credential = New-Object System.Management.Automation.PSCredential (\"#{new_resource.domain_user}@#{new_resource.domain_name}\",$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_hostname}\"" if new_resource.new_hostname