summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-03-29 08:29:57 -0700
committerGitHub <noreply@github.com>2018-03-29 08:29:57 -0700
commite18fcf789dd5bcf13ac6a3a3688b3e5c40a06196 (patch)
treec6d282682d6ef02b07681747fb52caffc0d15faa
parent841a8a9f667e0499af34abc9f31b46b112852b66 (diff)
parentde343a4028e703378432dd185ea40c7335e29c90 (diff)
downloadchef-e18fcf789dd5bcf13ac6a3a3688b3e5c40a06196.tar.gz
Merge pull request #7082 from brewn/windows-ad-join-description
[windows_ad_join] add description for :join action
-rw-r--r--lib/chef/resource/windows_ad_join.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/chef/resource/windows_ad_join.rb b/lib/chef/resource/windows_ad_join.rb
index b0f66cf2c0..7c026dba28 100644
--- a/lib/chef/resource/windows_ad_join.rb
+++ b/lib/chef/resource/windows_ad_join.rb
@@ -57,6 +57,8 @@ class Chef
default: true
action :join do
+ description "Join the Active Directory domain."
+
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);"