Merge branch 'chef-12.12.15' into 'master'

Upgrade to Chef 12.12.15

Fixes gitlab-org/omnibus-gitlab#1400

See merge request !923

CHANGELOG.md

@@ -15,6 +15,7 @@ omnibus-gitlab repository.
 - Add configuration that allows disabling of db migrations (Jason Plum) a50d09
 - Initial support for Redis Sentinel 267ace
 - Do not manage authorized keys anymore 7dc1d6
+- Upgrade to Chef 12.12.15
 
 
 8.10.5

config/projects/gitlab.rb

@@ -50,7 +50,7 @@ build_iteration Gitlab::BuildIteration.new.build_iteration
 
 override :ruby, version: '2.1.8', source: { md5: '091b62f0a9796a3c55de2a228a0e6ef3' }
 override :rubygems, version: '2.6.6'
-override :'chef-gem', version: '12.10.24'
+override :'chef-gem', version: '12.12.15'
 override :redis, version: '3.2.1', source: { md5: 'b311d4332326f1e6f86a461b4025636d' }
 override :postgresql, version: '9.2.17', source: { md5: 'a75d4a82eae1edda04eda2e60656e74c' }
 override :liblzma, version: '5.2.2', source: { md5: '7cf6a8544a7dae8e8106fdf7addfa28c' }

files/gitlab-cookbooks/gitlab/attributes/default.rb

@@ -338,8 +338,8 @@ default['gitlab']['postgresql']['listen_address'] = nil
 default['gitlab']['postgresql']['max_connections'] = 200
 default['gitlab']['postgresql']['md5_auth_cidr_addresses'] = []
 default['gitlab']['postgresql']['trust_auth_cidr_addresses'] = []
-default['gitlab']['postgresql']['shmmax'] = kernel['machine'] =~ /x86_64/ ? 17179869184 : 4294967295
-default['gitlab']['postgresql']['shmall'] = kernel['machine'] =~ /x86_64/ ? 4194304 : 1048575
+default['gitlab']['postgresql']['shmmax'] = node['kernel']['machine'] =~ /x86_64/ ? 17179869184 : 4294967295
+default['gitlab']['postgresql']['shmall'] = node['kernel']['machine'] =~ /x86_64/ ? 4194304 : 1048575
 default['gitlab']['postgresql']['semmsl'] = 250
 default['gitlab']['postgresql']['semmns'] = 32000
 default['gitlab']['postgresql']['semopm'] = 32

files/gitlab-cookbooks/gitlab/definitions/sysctl.rb

@@ -19,16 +19,18 @@ define :sysctl, value: nil do
   name = params[:name]
   value = params[:value]
 
-  directory "/etc/sysctl.d" do
+  directory "create /etc/sysctl.d for #{name}" do
+    path "/etc/sysctl.d"
     mode "0755"
     recursive true
   end
 
   conf_name = "90-omnibus-gitlab-#{name}.conf"
 
-  file "/opt/gitlab/embedded/etc/#{conf_name}" do
+  file "create /opt/gitlab/embedded/etc/#{conf_name} #{name}" do
+    path "/opt/gitlab/embedded/etc/#{conf_name}"
     content "#{name} = #{value}\n"
-    notifies :run, 'execute[load sysctl conf]', :immediately
+    notifies :run, "execute[load sysctl conf #{name}]", :immediately
   end
 
   link "/etc/sysctl.d/#{conf_name}" do
@@ -42,16 +44,16 @@ define :sysctl, value: nil do
     "/opt/gitlab/embedded/etc/90-omnibus-gitlab.conf",
     "/etc/sysctl.d/90-omnibus-gitlab.conf"
   ].each do |conf|
-    file conf do
+    file "delete #{conf} #{name}" do
+      path conf
       action :delete
       only_if { File.exists?(conf) }
     end
   end
 
   # Load the settings right away
-  execute "load sysctl conf" do
+  execute "load sysctl conf #{name}" do
     command "cat /etc/sysctl.conf /etc/sysctl.d/*.conf  | sysctl -e -p -"
     action :nothing
   end
 end
-

files/gitlab-cookbooks/gitlab/recipes/default.rb

@@ -37,10 +37,11 @@ end
 node.consume_attributes(Gitlab.generate_config(node['fqdn']))
 
 if File.exists?("/var/opt/gitlab/bootstrapped")
-	node.set['gitlab']['bootstrap']['enable'] = false
+	node.default['gitlab']['bootstrap']['enable'] = false
 end
 
-directory "/var/opt/gitlab" do
+directory "Create /var/opt/gitlab" do
+  path "/var/opt/gitlab"
   owner "root"
   group "root"
   mode "0755"
@@ -88,7 +89,8 @@ include_recipe "gitlab::add_trusted_certs"
   "ci-sidekiq",
   "mailroom"
 ].each do |dummy|
-  service dummy do
+  service "create a temporary #{dummy} service" do
+    service_name dummy
     supports []
   end
 end

files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb

@@ -88,8 +88,8 @@ end
   upgrade_status_dir,
   gitlab_rails_log_dir
 ].compact.each do |dir_name|
-  directory dir_name do
-    owner gitlab_user
+  directory "create #{dir_name}" do
+    path dir_name
     mode '0700'
     recursive true
   end