Merge branch 'local_mode_cache_warning' into 'master'

Local mode cache warning

Removes `WARN: Cookbook 'local-mode-cache' is empty or entirely chefignored at /opt/gitlab/embedded/cookbooks/local-mode-cache`

See merge request !459

files/gitlab-cookbooks/solo.rb

@@ -1,6 +1,7 @@
 CURRENT_PATH = File.expand_path(File.dirname(__FILE__))
 file_cache_path "#{CURRENT_PATH}/cache"
 cookbook_path CURRENT_PATH
+cache_path "#{CURRENT_PATH}/cache"
 verbose_logging false
 ssl_verify_mode :verify_peer
 # Omnibus-GitLab only needs to know very little about the system it is running

files/gitlab-ctl-commands/upgrade.rb

@@ -53,6 +53,10 @@ add_command 'upgrade', 'Run migrations after a package upgrade', 1 do |cmd_name|
     abort "Failed to start #{sv_name} for migrations" unless status.zero?
   end
 
+  # Do not show "WARN: Cookbook 'local-mode-cache' is empty or entirely chefignored at /opt/gitlab/embedded/cookbooks/local-mode-cache"
+  local_mode_cache_path = "#{base_path}/embedded/cookbooks/local-mode-cache"
+  run_command("rm -rf #{local_mode_cache_path}")
+
   log 'Reconfiguring GitLab to apply migrations'
   reconfigure(false) # sending 'false' means "don't quit afterwards"