diff options
| author | Sami Hiltunen <shiltunen@gitlab.com> | 2020-09-08 11:36:00 +0300 |
|---|---|---|
| committer | Sami Hiltunen <shiltunen@gitlab.com> | 2020-09-08 11:36:00 +0300 |
| commit | e69f4edfb425a0e386e32a63fd76c418ffda4c49 (patch) | |
| tree | c2f53ff3923b60d95154b021046bb92ccfffd914 | |
| parent | 5896f300e150fd11ff3a42b2869d2b8b2204d4fa (diff) | |
| parent | 9595ace0d51f1b1aa611f062dd0e4b6cca1afaa4 (diff) | |
Merge branch 'add_omnibus_internal_gitaly' into 'master'
Add omnibus gitaly to terraform setup
See merge request gitlab-org/gitaly!2520
| -rw-r--r-- | _support/terraform/roles/gitlab/templates/gitlab-gitlab.rb.j2 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/_support/terraform/roles/gitlab/templates/gitlab-gitlab.rb.j2 b/_support/terraform/roles/gitlab/templates/gitlab-gitlab.rb.j2 index 814e81e7d..7961edcd0 100644 --- a/_support/terraform/roles/gitlab/templates/gitlab-gitlab.rb.j2 +++ b/_support/terraform/roles/gitlab/templates/gitlab-gitlab.rb.j2 @@ -1,11 +1,16 @@ external_url 'http://{{ groups['gitlabs'][0] }}' -gitaly['enable'] = false +gitaly['enable'] = true +gitaly['listen_addr'] = '0.0.0.0:8705' git_data_dirs({ "default" => { "gitaly_address" => "tcp://{{ groups['loadbalancers'][0] }}:2305", "gitaly_token" => '{{ praefect_external_token }}' + }, + "internal" => { + "gitaly_address" => "tcp://{{ hostvars[groups['gitlabs'][0]]['internal'] }}:8705", + "gitaly_token" => '{{ praefect_external_token }}' } }) |