From bd9b2b0eb8b47c6a3ca6617a4dcdf821fde761f0 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Fri, 8 May 2020 00:06:32 +0100
Subject: [PATCH] Update chef client to 15.10.12

---
 .kitchen.yml                                   | 3 ++-
 cookbooks/chef/attributes/default.rb           | 2 +-
 cookbooks/chef/templates/default/client.rb.erb | 4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.kitchen.yml b/.kitchen.yml
index 05d70d470..51f0fc43e 100644
--- 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 d97d6f883..049bd8608 100644
--- 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 094340f16..796b276c5 100644
--- 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
-- 
2.39.5