From 2f05629fded54b778a9743264a66638011cbf8b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= <greg@karekinian.com>
Date: Wed, 3 Apr 2019 12:52:32 +0200
Subject: [PATCH] Revert "Revert "Update Chef to 14.11.21""

This reverts commit db4b45b5c26c50c7b883d0f96b2a9a5136f26b58.
---
 .chef/knife.rb                                |  2 +-
 Gemfile                                       |  2 +-
 Gemfile.lock                                  | 24 +++++++++----------
 Vagrantfile                                   |  4 ++--
 site-cookbooks/kosmos-base/recipes/default.rb |  2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.chef/knife.rb b/.chef/knife.rb
index c8d218b..e19b79a 100644
--- a/.chef/knife.rb
+++ b/.chef/knife.rb
@@ -16,4 +16,4 @@ cookbook_email         'mail@kosmos.org'
 # cookbooks
 knife[:berkshelf] = false
 # Set Chef version installed by `knife solo prepare`
-knife[:bootstrap_version] = "13.8.5"
+knife[:bootstrap_version] = "14.11.21"
diff --git a/Gemfile b/Gemfile
index e4e8bf4..5482922 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'chef', '~> 14.9.13'
+gem 'chef', '~> 14.11.21'
 gem 'berkshelf', '~> 7.0'
 gem 'knife-solo', '~> 0.7.0'
 gem 'knife-solo_data_bag'
diff --git a/Gemfile.lock b/Gemfile.lock
index 2a812af..5c70f86 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -18,10 +18,10 @@ GEM
       solve (~> 4.0)
       thor (>= 0.20)
     builder (3.2.3)
-    chef (14.9.13)
+    chef (14.11.21)
       addressable
       bundler (>= 1.10)
-      chef-config (= 14.9.13)
+      chef-config (= 14.11.21)
       chef-zero (>= 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -48,16 +48,16 @@ GEM
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef-config (14.9.13)
+    chef-config (14.11.21)
       addressable
       fuzzyurl
       mixlib-config (>= 2.2.12, < 3.0)
       mixlib-shellout (~> 2.0)
       tomlrb (~> 1.2)
-    chef-zero (14.0.11)
+    chef-zero (14.0.12)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
-      mixlib-log (~> 2.0)
+      mixlib-log (>= 2.0, < 4.0)
       rack (~> 2.0, >= 2.0.6)
       uuidtools (~> 2.1)
     cleanroom (1.0.0)
@@ -92,7 +92,7 @@ GEM
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
     minitar (0.8)
-    mixlib-archive (0.4.19)
+    mixlib-archive (0.4.20)
       mixlib-log
     mixlib-authentication (2.1.1)
     mixlib-cli (1.7.0)
@@ -122,15 +122,15 @@ GEM
     nori (2.6.0)
     octokit (4.13.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (14.8.10)
+    ohai (14.8.11)
       chef-config (>= 12.8, < 15)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
       ipaddress
       mixlib-cli (>= 1.7.0)
-      mixlib-config (~> 2.0)
-      mixlib-log (~> 2.0, >= 2.0.1)
-      mixlib-shellout (~> 2.0)
+      mixlib-config (>= 2.0, < 4.0)
+      mixlib-log (>= 2.0.1, < 4.0)
+      mixlib-shellout (>= 2.0, < 4.0)
       plist (~> 3.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
@@ -186,7 +186,7 @@ GEM
     solve (4.0.2)
       molinillo (~> 0.6)
       semverse (>= 1.1, < 4.0)
-    specinfra (2.76.9)
+    specinfra (2.77.0)
       net-scp
       net-ssh (>= 2.7)
       net-telnet (= 0.1.1)
@@ -231,7 +231,7 @@ PLATFORMS
 
 DEPENDENCIES
   berkshelf (~> 7.0)
-  chef (~> 14.9.13)
+  chef (~> 14.11.21)
   cookstyle
   knife-solo (~> 0.7.0)
   knife-solo_data_bag
diff --git a/Vagrantfile b/Vagrantfile
index 8a17220..104d69e 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -12,7 +12,7 @@ Vagrant.configure(2) do |config|
 
   # Every Vagrant development environment requires a box. You can search for
   # boxes at https://atlas.hashicorp.com/search.
-  config.vm.box = "bento/ubuntu-16.04"
+  config.vm.box = "bento/ubuntu-18.04"
 
   config.vm.provider :virtualbox do |vb|
     # Customize the amount of memory on the VM:
@@ -83,7 +83,7 @@ Vagrant.configure(2) do |config|
   # SHELL
 
   config.vm.provision :chef_zero do |chef|
-    chef.version                            = '12.21.3'
+    chef.version                            = '14.11.21'
     chef.cookbooks_path                     = ['cookbooks', 'site-cookbooks']
     chef.data_bags_path                     = 'data_bags'
     chef.roles_path                         = 'roles'
diff --git a/site-cookbooks/kosmos-base/recipes/default.rb b/site-cookbooks/kosmos-base/recipes/default.rb
index 17cb555..8bb6358 100644
--- a/site-cookbooks/kosmos-base/recipes/default.rb
+++ b/site-cookbooks/kosmos-base/recipes/default.rb
@@ -12,7 +12,7 @@ include_recipe 'timezone_iii'
 include_recipe 'ntp'
 
 # Update chef to the chosen version
-chef_version = '12.22.3'
+chef_version = '14.11.21'
 chef_client_updater "Install #{chef_version}" do
   version chef_version
 end