Update chef client to 15.10.12

diff --git a/.kitchen.yml b/.kitchen.yml
index 05d70d470133d6d076e81d9cc2af1cfe3c221769..51f0fc43e9922439a9bcafdf43243eff63aa6e2d 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -1,13 +1,14 @@
 ---
 driver:
   name: dokken
-  chef_version: 14
+  chef_version: 15
 
 transport:
   name: dokken
 
 provisioner:
   name: dokken
+  chef_license: accept
   data_bags_path: test/data_bags
 
 verifier:

diff --git a/cookbooks/chef/attributes/default.rb b/cookbooks/chef/attributes/default.rb
index d97d6f8839d339ab8872e2865f33c0cade5104a8..049bd860820d7fc975ec1a03d4a275ed5c1e00a1 100644 (file)
--- a/cookbooks/chef/attributes/default.rb
+++ b/cookbooks/chef/attributes/default.rb
@@ -5,4 +5,4 @@ default[:apt][:sources] = node[:apt][:sources] | ["opscode"]
 default[:chef][:server][:version] = "12.17.33"
 
 # Set the default client version
-default[:chef][:client][:version] = "14.14.29"
+default[:chef][:client][:version] = "15.10.12"

diff --git a/cookbooks/chef/templates/default/client.rb.erb b/cookbooks/chef/templates/default/client.rb.erb
index 094340f160d8967ac47dbfec386ed16bcc822181..796b276c57e1704dcf2dc5947d0cff4576456c01 100644 (file)
--- a/cookbooks/chef/templates/default/client.rb.erb
+++ b/cookbooks/chef/templates/default/client.rb.erb
@@ -9,6 +9,10 @@
 
 Encoding.default_external = Encoding::UTF_8
 
+# Accept the license
+
+chef_license "accept"
+
 # Log at level info
 
 log_level :info