Merge branch '2750-ssh-private-keys' into 'master'

Stop generating / referencing SSH private keys for the git user on Geo primaries

Closes #2750

See merge request !1917
# Conflicts:
#	CHANGELOG.md

CHANGELOG.md

@@ -22,6 +22,8 @@ omnibus-gitlab repository.
 - Add omniauth sync_profile_from_provider and sync_profile_attributes configuration
 - Upgrade ruby version to 2.3.5
 - Upgrade libyaml version to 0.1.7
+- Only generate a private SSH key on Geo secondaries c2f2dcba
+- Support LFS object storage options for GitLab EEP
 9.5.5

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

@@ -44,12 +44,11 @@ end
   end
 end
-include_recipe 'gitlab-ee::ssh_keys'
-
 # Geo secondary
 if node['gitlab']['geo-postgresql']['enable']
   include_recipe 'gitlab-ee::geo-secondary'
   include_recipe 'gitlab-ee::geo_database_migrations'
+  include_recipe 'gitlab-ee::ssh_keys'
 end
 # pgbouncer_user and pgbouncer_user_password are settings for the account

files/gitlab-ctl-commands-ee/set_geo_primary_node.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
-add_command_under_category 'set-geo-primary-node', 'gitlab-geo', 'Make this node the Geo primary', 2 do |cmd_name, path|
+add_command_under_category 'set-geo-primary-node', 'gitlab-geo', 'Make this node the Geo primary', 2 do |cmd_name|
   service_name = 'unicorn'
   unless service_enabled?(service_name)
@@ -23,14 +23,7 @@ add_command_under_category 'set-geo-primary-node', 'gitlab-geo', 'Make this node
     Kernel.exit 1
   end
-  ssh_file_path = path || '/var/opt/gitlab/.ssh/id_rsa.pub'
-
-  unless File.exist?(ssh_file_path)
-    log "Didn't find #{ssh_file_path}, please supply the path to the Geo SSH public key, e.g.: gitlab-ctl add-geo-primary-node /path/to/id_rsa.pub"
-    Kernel.exit 1
-  end
-
-  command = "gitlab-rake geo:set_primary_node[#{ssh_file_path}]"
+  command = "gitlab-rake geo:set_primary_node"
   run_command(command)
 end