From 2c2ae596ed8939d6fc304b892c3f0d8aa95bb511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= <greg@karekinian.com>
Date: Tue, 8 Oct 2019 18:12:40 +0200
Subject: [PATCH] Don't update chef using the chef_client_updater cookbook

It only makes sense when using Chef Server, which we don't
---
 Berksfile                                     |  1 -
 Berksfile.lock                                |  3 --
 roles/base.rb                                 |  1 -
 site-cookbooks/kosmos-base/metadata.rb        |  1 -
 .../kosmos-base/recipes/chef_client.rb        | 31 -------------------
 5 files changed, 37 deletions(-)
 delete mode 100644 site-cookbooks/kosmos-base/recipes/chef_client.rb

diff --git a/Berksfile b/Berksfile
index fa7535c..9ca46bd 100644
--- a/Berksfile
+++ b/Berksfile
@@ -36,7 +36,6 @@ cookbook 'git',                    '= 6.0.0'
 cookbook 'hostsfile',              '= 2.4.5'
 cookbook 'ohai',                   '~> 5.2.5'
 cookbook 'nodejs',                 '~> 5.0.0'
-cookbook 'chef_client_updater',    '= 1.1.1'
 cookbook 'timezone_iii',           '= 1.0.4'
 cookbook 'ark',                    '= 3.1.0'
 cookbook 'logrotate',              '= 2.2.0'
diff --git a/Berksfile.lock b/Berksfile.lock
index baf13d7..e88f57e 100644
--- a/Berksfile.lock
+++ b/Berksfile.lock
@@ -7,7 +7,6 @@ DEPENDENCIES
   ark (= 3.1.0)
   build-essential (~> 8.2.1)
   chef-sugar (= 3.3.0)
-  chef_client_updater (= 1.1.1)
   compat_resource (= 12.19.0)
   composer (~> 2.6.1)
   elasticsearch (= 4.2.0)
@@ -76,8 +75,6 @@ GRAPH
     mingw (>= 1.1)
     seven_zip (>= 0.0.0)
   chef-sugar (3.3.0)
-  chef_client_updater (1.1.1)
-    compat_resource (>= 12.16.3)
   compat_resource (12.19.0)
   composer (2.6.1)
     apt (>= 0.0.0)
diff --git a/roles/base.rb b/roles/base.rb
index f6005b7..86d3ab5 100644
--- a/roles/base.rb
+++ b/roles/base.rb
@@ -1,6 +1,5 @@
 name "base"
 
 run_list %w(
-  kosmos-base::chef_client
   kosmos-base::default
 )
diff --git a/site-cookbooks/kosmos-base/metadata.rb b/site-cookbooks/kosmos-base/metadata.rb
index c926045..723f67a 100644
--- a/site-cookbooks/kosmos-base/metadata.rb
+++ b/site-cookbooks/kosmos-base/metadata.rb
@@ -12,6 +12,5 @@ depends 'users'
 depends 'kosmos-postfix'
 depends 'hostname'
 depends 'firewall'
-depends 'chef_client_updater'
 depends 'timezone_iii'
 depends 'ntp'
diff --git a/site-cookbooks/kosmos-base/recipes/chef_client.rb b/site-cookbooks/kosmos-base/recipes/chef_client.rb
deleted file mode 100644
index 6443a5e..0000000
--- a/site-cookbooks/kosmos-base/recipes/chef_client.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Cookbook Name:: kosmos-base
-# Recipe:: chef_client
-#
-# The MIT License (MIT)
-#
-# Copyright:: 2019, Kosmos Developers
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-# Update chef to the chosen version
-chef_version = '14.11.21'
-chef_client_updater "Install #{chef_version}" do
-  version chef_version
-end