summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorMike Moulton <mike@meltmedia.com>2011-09-10 22:34:05 +0000
committerMike Moulton <mike@meltmedia.com>2011-09-10 22:34:05 +0000
commitb9c4a3c2076e3164cce296e8aa5d8b241c0f77a9 (patch)
tree9962e97d8a5f1de4bbad4493109f62c07b27711d /templates
parentd88823191ed67fd1801931df43e6f6c26e1a0e42 (diff)
downloadvyos-cloud-init-b9c4a3c2076e3164cce296e8aa5d8b241c0f77a9.tar.gz
vyos-cloud-init-b9c4a3c2076e3164cce296e8aa5d8b241c0f77a9.zip
Modifications to properly support both 'gems' and 'packages' install types.
Added support for 'node_name' and 'environment' properties. Renamed 'validation_cert' to 'validation_key' to match Chef's nomenclature.
Diffstat (limited to 'templates')
-rw-r--r--templates/chef_client.rb.tmpl19
1 files changed, 11 insertions, 8 deletions
diff --git a/templates/chef_client.rb.tmpl b/templates/chef_client.rb.tmpl
index d69dedc0..d3d9a922 100644
--- a/templates/chef_client.rb.tmpl
+++ b/templates/chef_client.rb.tmpl
@@ -1,12 +1,15 @@
-log_level :info
-log_location "/var/log/chef/client.log"
-ssl_verify_mode :verify_none
+log_level :info
+log_location "/var/log/chef/client.log"
+ssl_verify_mode :verify_none
validation_client_name "$validation_name"
validation_key "/etc/chef/validation.pem"
-client_key "/etc/chef/client.pem"
-chef_server_url "$server_url"
-file_cache_path "/var/cache/chef"
-file_backup_path "/var/backups/chef"
-pid_file "/var/run/chef/client.pid"
+client_key "/etc/chef/client.pem"
+chef_server_url "$server_url"
+environment "$environment"
+node_name "$node_name"
+json_attribs "/etc/chef/firstboot.json"
+file_cache_path "/var/cache/chef"
+file_backup_path "/var/backups/chef"
+pid_file "/var/run/chef/client.pid"
Chef::Log::Formatter.show_time = true