From 189b66a36fe594eaeaaf756fe461b94156c64220 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= <greg@karekinian.com>
Date: Fri, 16 Jun 2017 11:43:24 +0200
Subject: [PATCH] Update Chef to 12.20.3

---
 Gemfile                                       |  2 +-
 Gemfile.lock                                  | 52 +++++++++----------
 Vagrantfile                                   |  2 +-
 site-cookbooks/kosmos-base/recipes/default.rb |  2 +-
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/Gemfile b/Gemfile
index 101aa69..2e98a4e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'chef'
+gem 'chef',                '~> 12.20.3'
 gem 'batali'
 gem 'knife-solo'
 gem 'knife-solo_data_bag'
diff --git a/Gemfile.lock b/Gemfile.lock
index 393eab1..b6f5244 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.0)
+    addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
     artifactory (2.8.1)
     ast (2.3.0)
@@ -34,10 +34,10 @@ GEM
       command_line_reporter
       paint
     builder (3.2.3)
-    chef (12.19.36)
+    chef (12.20.3)
       addressable
       bundler (>= 1.10)
-      chef-config (= 12.19.36)
+      chef-config (= 12.20.3)
       chef-zero (>= 4.8)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -63,12 +63,12 @@ GEM
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef-config (12.19.36)
+    chef-config (12.20.3)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
-    chef-zero (5.3.1)
+    chef-zero (13.0.0)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
       mixlib-log (~> 1.3)
@@ -102,7 +102,7 @@ GEM
       domain_name (~> 0.5)
     http-form_data (1.0.1)
     http_parser.rb (0.6.0)
-    iniparse (1.4.2)
+    iniparse (1.4.3)
     ipaddress (0.8.3)
     knife-solo (0.6.0)
       chef (>= 10.20)
@@ -137,8 +137,8 @@ GEM
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
     net-telnet (0.1.1)
-    ohai (8.23.0)
-      chef-config (>= 12.5.0.alpha.1, < 13)
+    ohai (8.24.0)
+      chef-config (>= 12.5.0.alpha.1, < 14)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
       ipaddress
@@ -152,30 +152,30 @@ GEM
     paint (2.0.0)
     parser (2.4.0.0)
       ast (~> 2.2)
-    plist (3.2.0)
+    plist (3.3.0)
     powerpack (0.1.1)
     proxifier (1.0.3)
     public_suffix (2.0.5)
-    rack (2.0.1)
+    rack (2.0.3)
     rainbow (2.2.2)
       rake
     rake (12.0.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
+      rspec-support (~> 3.6.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.5.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
     rspec_junit_formatter (0.2.3)
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
@@ -187,14 +187,14 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.8.1)
     safe_yaml (1.0.4)
-    serverspec (2.38.0)
+    serverspec (2.39.1)
       multi_json
       rspec (~> 3.0)
       rspec-its
-      specinfra (~> 2.53)
+      specinfra (~> 2.68)
     sfl (2.3)
     slop (3.6.0)
-    specinfra (2.67.3)
+    specinfra (2.68.0)
       net-scp
       net-ssh (>= 2.7, < 5.0)
       net-telnet
@@ -222,11 +222,11 @@ PLATFORMS
 
 DEPENDENCIES
   batali
-  chef
+  chef (~> 12.20.3)
   cookstyle
   knife-solo
   knife-solo_data_bag
   test-kitchen
 
 BUNDLED WITH
-   1.14.6
+   1.15.1
diff --git a/Vagrantfile b/Vagrantfile
index cb1c22a..9a359c5 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -85,7 +85,7 @@ Vagrant.configure(2) do |config|
   # Install latest Chef via Omnibus
   # Needs `vagrant plugin install vagrant-omnibus`
   if Vagrant.has_plugin?("vagrant-omnibus")
-    config.omnibus.chef_version = "12.19.36"
+    config.omnibus.chef_version = "12.20.3"
   end
 
   config.vm.provision :chef_zero do |chef|
diff --git a/site-cookbooks/kosmos-base/recipes/default.rb b/site-cookbooks/kosmos-base/recipes/default.rb
index 8b65e93..4cc1129 100644
--- a/site-cookbooks/kosmos-base/recipes/default.rb
+++ b/site-cookbooks/kosmos-base/recipes/default.rb
@@ -12,7 +12,7 @@ include_recipe 'timezone-ii'
 include_recipe 'ntp'
 
 # Update chef to the chosen version
-chef_version = '12.19.36'
+chef_version = '12.20.3'
 chef_client_updater "Install #{chef_version}" do
   version chef_version
 end