Merge branch 'workhorse-gitaly-address' into 'master'

Pass GitalyAddress to workhorse

See merge request !10447

2 files changed, 9 insertions, 2 deletions

diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb
index 09c3bd8fc9e..08011301d3c 100644
--- a/lib/gitlab/workhorse.rb
+++ b/lib/gitlab/workhorse.rb
@@ -45,7 +45,12 @@ module Gitlab
                               raise "Unsupported action: #{action}"
                             end
 
-          params[:GitalySocketPath] = URI(address).path if feature_enabled
+          if feature_enabled
+            params[:GitalyAddress] = address
+            # TODO deprecate GitalySocketPath once GITLAB_WORKHORSE_VERSION points
+            # to a version that supports GitalyAddress.
+            params[:GitalySocketPath] = URI(address).path
+          end
         end
 
         params
diff --git a/spec/lib/gitlab/workhorse_spec.rb b/spec/lib/gitlab/workhorse_spec.rb
index a5b7d9ad35f..9fbcb1fee69 100644
--- a/spec/lib/gitlab/workhorse_spec.rb
+++ b/spec/lib/gitlab/workhorse_spec.rb
@@ -188,8 +188,10 @@ describe Gitlab::Workhorse, lib: true do
 
     context 'when Gitaly is enabled' do
       let(:gitaly_params) do
+        address = Gitlab::GitalyClient.get_address('default')
         {
-          GitalySocketPath: URI(Gitlab::GitalyClient.get_address('default')).path,
+          GitalySocketPath: URI(address).path,
+          GitalyAddress: address,
         }
       end