| Revision | a994a86593746842404daccfcdab6e90a614c106 (tree) |
|---|---|
| Time | 2017-11-30 20:59:01 |
| Author | whitestar <whitestar@user...> |
| Commiter | whitestar |
adds ARM architecture support.
cookbooks/chef_utils/CHANGELOG.md (diff) cookbooks/chef_utils/attributes/default.rb (diff) cookbooks/chef_utils/recipes/chef-client.rb (diff) cookbooks/chef_utils/version (diff)| @@ -1,6 +1,10 @@ | ||
| 1 | 1 | CHANGELOG for chef_utils |
| 2 | 2 | ========================= |
| 3 | 3 | |
| 4 | +0.8.4 | |
| 5 | +----- | |
| 6 | +- adds ARM architecture support. | |
| 7 | + | |
| 4 | 8 | 0.8.3 |
| 5 | 9 | ----- |
| 6 | 10 | - includes the `ssl_cert::server_key_pairs` recipe in the `chef_utils::chef-server-configuration` recipe automatically. |
| @@ -27,7 +27,7 @@ default['chef_utils']['chef_gem']['source'] = nil | ||
| 27 | 27 | default['chef_utils']['chef_gem']['options'] = nil |
| 28 | 28 | default['chef_utils']['chef_gem_packages'] = [] |
| 29 | 29 | default['chef_utils']['bracecomp']['version'] = nil |
| 30 | -default['chef_utils']['chef-client']['version'] = '12.17.44' #'12.16.42' | |
| 30 | +default['chef_utils']['chef-client']['version'] = '12.21.26' | |
| 31 | 31 | default['chef_utils']['chef-client']['checksum'] = nil # no check |
| 32 | 32 | default['chef_utils']['chef-client']['force_install'] = false |
| 33 | 33 | chef_client_ver = node['chef_utils']['chef-client']['version'] |
| @@ -45,7 +45,7 @@ default['chef_utils']['chef-client']['release_url'] = node.value_for_platform( | ||
| 45 | 45 | ) |
| 46 | 46 | default['chef_utils']['chef-client']['fallback_omnitruck_install'] = false |
| 47 | 47 | default['chef_utils']['chef-client']['omnitruck_installer_url'] = 'https://omnitruck.chef.io/install.sh' |
| 48 | -default['chef_utils']['chef-vault']['version'] = '~> 2.6' | |
| 48 | +default['chef_utils']['chef-vault']['version'] = '>= 2.6' | |
| 49 | 49 | default['chef_utils']['chefspec']['version'] = nil |
| 50 | 50 | default['chef_utils']['knife-acl']['version'] = nil |
| 51 | 51 | default['chef_utils']['knife-ec2']['version'] = nil |
| @@ -33,6 +33,27 @@ omnitruck_installer_url = node['chef_utils']['chef-client']['omnitruck_installer | ||
| 33 | 33 | expected_version = "[ \"$(chef-client -v | awk '{ print $2 }')\" = '#{version}' ]" |
| 34 | 34 | status_file = '/tmp/install_chef-client_status' |
| 35 | 35 | |
| 36 | +if kernel_machine == 'armv7l' | |
| 37 | + Chef::Log.warn("This chef_utils::chef-client recipe installs Chef by the gem package on #{kernel_machine} architecture.") | |
| 38 | + | |
| 39 | + [ | |
| 40 | + 'ruby-ffi', | |
| 41 | + 'ruby-ffi-yajl', | |
| 42 | + ].each {|pkg| | |
| 43 | + resources(package: pkg) rescue package pkg do | |
| 44 | + action :install | |
| 45 | + end | |
| 46 | + } | |
| 47 | + | |
| 48 | + gem_package 'chef' do | |
| 49 | + version version | |
| 50 | + options('--no-rdoc --no-ri') | |
| 51 | + action :install | |
| 52 | + end | |
| 53 | + | |
| 54 | + return | |
| 55 | +end | |
| 56 | + | |
| 36 | 57 | # Pinning chef version |
| 37 | 58 | template '/etc/apt/preferences.d/chef.pref' do |
| 38 | 59 | source 'etc/apt/preferences.d/chef.pref' |
| @@ -1 +1 @@ | ||
| 1 | -0.8.3 | |
| 1 | +0.8.4 |
Fork