Merge pull request #2321 from acranox/chef-client-docs

website: Update docs for default configuration template
11 years ago · 1b9d0dcddd
parent 4a60e469e9 5896d96bdb
commit 1b9d0dcddd
1 changed files with 6 additions and 0 deletions
--- a/website/source/docs/provisioners/chef-client.html.markdown
+++ b/website/source/docs/provisioners/chef-client.html.markdown
@ -113,11 +113,17 @@ The default value for the configuration template is:
 log_level        :info
 log_location     STDOUT
 chef_server_url  "{{.ServerUrl}}"
+{{if ne .ValidationClientName ""}}
+validation_client_name "{{.ValidationClientName}}"
+{{else}}
 validation_client_name "chef-validator"
+{{end}}
 {{if ne .ValidationKeyPath ""}}
 validation_key "{{.ValidationKeyPath}}"
 {{end}}
+{{if ne .NodeName ""}}
 node_name "{{.NodeName}}"
+{{end}}
 ```

 This template is a [configuration template](/docs/templates/configuration-templates.html)