Merge branch 'gitaly-client-path' into 'master'

Render gitaly.client_path in gitlab.yml

See merge request gitlab-org/omnibus-gitlab!1986

CHANGELOG.md

@@ -16,6 +16,7 @@ omnibus-gitlab repository.
 - Added PostgreSQL support for log_lock_waits and deadlock_timeout
 - Added PostgreSQL support for track_io_timing
 - Rename Rails secret jws_private_key to openid_connect_signing_key
+- Render gitaly.client_path in gitlab.yml
 
 10.0.4
 

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

@@ -392,6 +392,7 @@ production: &base
   # Eventually Gitaly use will become mandatory and
   # this option will disappear.
   gitaly:
+    client_path: /opt/gitlab/embedded/bin
     token: <%= @gitaly_token.to_s.to_json %>
 
 

spec/chef/recipes/gitlab-rails_spec.rb

@@ -435,6 +435,11 @@ describe 'gitlab::gitlab-rails' do
     end
 
     context 'Gitaly settings' do
+      it 'renders client_path' do
+        expect(chef_run).to render_file(gitlab_yml_path)
+          .with_content(%r{gitaly:\s+client_path: /opt/gitlab/embedded/bin\s})
+      end
+
       context 'when a global token is set' do
         let(:token) { '123secret456gitaly' }
 
@@ -442,7 +447,7 @@ describe 'gitlab::gitlab-rails' do
           stub_gitlab_rb(gitlab_rails: { gitaly_token: token })
 
           expect(chef_run).to render_file(gitlab_yml_path)
-            .with_content(%r{gitaly:\s+token: "#{token}"})
+            .with_content(%r{gitaly:\s+client_path: /opt/gitlab/embedded/bin\s+token: "#{token}"})
         end
       end
     end