kosmos/chef
kosmos
/
chef
8
3
Fork 0
Code Issues 37 Pull Requests 1 Projects 1 Activity

Revert "Revert "Update Chef to 14.11.21"" 

This reverts commit db4b45b5c2.
This commit is contained in:
Greg 2019-04-03 12:52:32 +02:00
parent 6b9ce81212
commit 2f05629fde
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.chef/knife.rb
View File

@ -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"

2
Gemfile
View File

@ -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'

24
Gemfile.lock
View File

@ -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

4
Vagrantfile vendored
View File

@ -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'

2
site-cookbooks/kosmos-base/recipes/default.rb
View File

@ -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