Don't update chef using the chef_client_updater cookbook
It only makes sense when using Chef Server, which we don't
This commit is contained in:
parent
34d69dbca1
commit
2c2ae596ed
|
@ -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'
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
name "base"
|
||||
|
||||
run_list %w(
|
||||
kosmos-base::chef_client
|
||||
kosmos-base::default
|
||||
)
|
||||
|
|
|
@ -12,6 +12,5 @@ depends 'users'
|
|||
depends 'kosmos-postfix'
|
||||
depends 'hostname'
|
||||
depends 'firewall'
|
||||
depends 'chef_client_updater'
|
||||
depends 'timezone_iii'
|
||||
depends 'ntp'
|
||||
|
|
|
@ -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
|
Loading…
Reference in New Issue