Merge branch 'remove_deprecated_satellites_configuration'

CHANGELOG.md

@@ -3,6 +3,10 @@
 The latest version of this file can be found at the master branch of the
 omnibus-gitlab repository.
 
+9.1.0
+
+- Remove deprecated satellites configuration
+
 9.0.2
 
 - No changes
@@ -44,8 +48,7 @@ are not the same (O Schwede) c4e83c5
 - EE: Add a tracking database for GitLab Geo f1077d10
 - Provide default Host header for requests that do not have one 14f77c
 - Gitaly service on by default 350dea
-- Update Nginx to 1.10.3
-- Added support for configuring hosts for database load balancing
+- Update Nginx to 1.10.3 211a89fb6
 
 8.17.3
 

files/gitlab-config-template/gitlab.rb.template

@@ -260,9 +260,6 @@ external_url 'GENERATED_EXTERNAL_URL'
 ###! Docs: https://docs.gitlab.com/ce/development/shared_files.html
 # gitlab_rails['shared_path'] = '/var/opt/gitlab/gitlab-rails/shared'
 
-
-### DEPRECATED: gitlab_rails['satellites_timeout'] = 30
-
 ### GitLab Shell settings for GitLab
 # gitlab_rails['gitlab_shell_ssh_port'] = 22
 # gitlab_rails['git_max_size'] = 20971520

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

@@ -179,13 +179,6 @@ default['gitlab']['gitlab-rails']['omniauth_providers'] = []
 
 default['gitlab']['gitlab-rails']['shared_path'] = "/var/opt/gitlab/gitlab-rails/shared"
 
-# Important: keep the satellites.path setting until GitLab 9.0 at
-# least. This setting is fed to 'rm -rf' in
-# db/migrate/20151023144219_remove_satellites.rb
-default['gitlab']['gitlab-rails']['satellites_path'] = "/var/opt/gitlab/git-data/gitlab-satellites"
-default['gitlab']['gitlab-rails']['satellites_timeout'] = nil
-#
-
 default['gitlab']['gitlab-rails']['backup_path'] = "/var/opt/gitlab/backups"
 default['gitlab']['gitlab-rails']['manage_backup_path'] = true
 default['gitlab']['gitlab-rails']['backup_archive_permissions'] = nil

files/gitlab-cookbooks/gitlab/libraries/gitlab_shell.rb

@@ -45,11 +45,6 @@ module GitlabShell
         Hash[Gitlab['gitlab_shell']['git_data_directories'].map do |name, data_directory|
           [name, { 'path' => File.join(data_directory['path'], 'repositories') }]
         end]
-
-      # Important: keep the satellites.path setting until GitLab 9.0 at
-      # least. This setting is fed to 'rm -rf' in
-      # db/migrate/20151023144219_remove_satellites.rb
-      Gitlab['gitlab_rails']['satellites_path'] ||= File.join(Gitlab['gitlab_shell']['git_data_directories']['default']['path'], "gitlab-satellites")
     end
 
     def parse_auth_file

files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb

@@ -366,15 +366,6 @@ production: &base
   # 4. Advanced settings
   # ==========================
 
-  # GitLab Satellites
-  # Important: keep the satellites.path setting until GitLab 9.0 at
-  # least. This setting is fed to 'rm -rf' in
-  # db/migrate/20151023144219_remove_satellites.rb
-  satellites:
-    # Relative paths are relative to Rails.root (default: tmp/repo_satellites/)
-    path: <%= @satellites_path %>
-    timeout: <%= @satellites_timeout %>
-
   ## Repositories settings
   repositories:
     # Paths where repositories can be stored. Give the canonicalized absolute pathname.
@@ -455,8 +446,6 @@ test:
     # In order to setup it correctly you need to specify
     # your system username you use to run GitLab
     # user: YOUR_USERNAME
-  satellites:
-    path: tmp/tests/gitlab-satellites/
   repositories:
     storages:
       default: { "path": "tmp/tests/repositories/" }