diff options
| author | Alejandro Rodríguez <alejorro70@gmail.com> | 2017-09-05 22:59:09 +0300 |
|---|---|---|
| committer | Alejandro Rodríguez <alejorro70@gmail.com> | 2017-09-05 22:59:09 +0300 |
| commit | 9696fe4e2ee9c79010baa2a7f4b3ed7fc665e963 (patch) | |
| tree | a477e785d409bedaf3a5d171b71070b8437c3033 | |
| parent | ed6e0faa4710d0578dcff0adb2122ff47c13236f (diff) | |
Update test-cluster for redis-less gitaly hosts
| -rw-r--r-- | _support/test-cluster/app1/etc-gitlab/gitlab.rb | 3 | ||||
| -rw-r--r-- | _support/test-cluster/docker-compose.yml | 6 | ||||
| -rw-r--r-- | _support/test-cluster/gitaly1/etc-gitlab/gitlab.rb | 2 | ||||
| -rw-r--r-- | _support/test-cluster/gitaly2/etc-gitlab/gitlab.rb | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/_support/test-cluster/app1/etc-gitlab/gitlab.rb b/_support/test-cluster/app1/etc-gitlab/gitlab.rb index 13d7b0bfa..49b3fdf67 100644 --- a/_support/test-cluster/app1/etc-gitlab/gitlab.rb +++ b/_support/test-cluster/app1/etc-gitlab/gitlab.rb @@ -7,6 +7,9 @@ gitaly['enable'] = false # Don't disable Gitaly altogether gitlab_rails['gitaly_enabled'] = true +redis['port'] = 6379 +redis['bind'] = '0.0.0.0' + git_data_dirs({ 'default' => {'path' => '/mnt/data1', 'gitaly_address' => 'tcp://gitaly1:6666'}, 'gitaly2' => {'path' => '/mnt/data2', 'gitaly_address' => 'tcp://gitaly2:6666'}, diff --git a/_support/test-cluster/docker-compose.yml b/_support/test-cluster/docker-compose.yml index 46ccf93c7..1544af567 100644 --- a/_support/test-cluster/docker-compose.yml +++ b/_support/test-cluster/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: app1: - image: gitlab/gitlab-ce:9.2.0-rc1.ce.0 + image: gitlab/gitlab-ce:9.5.3-ce.0 ports: - "8080:80" - "2222:22" @@ -13,14 +13,14 @@ services: - ./gitaly1/data:/mnt/data1 - ./gitaly2/data:/mnt/data2 gitaly1: - image: gitlab/gitlab-ce:9.2.0-rc1.ce.0 + image: gitlab/gitlab-ce:9.5.3-ce.0 expose: - 6666 volumes: - ./gitaly1/data:/var/opt/gitlab/git-data - ./gitaly1/etc-gitlab:/etc/gitlab gitaly2: - image: gitlab/gitlab-ce:9.2.0-rc1.ce.0 + image: gitlab/gitlab-ce:9.5.3-ce.0 expose: - 6666 volumes: diff --git a/_support/test-cluster/gitaly1/etc-gitlab/gitlab.rb b/_support/test-cluster/gitaly1/etc-gitlab/gitlab.rb index 1ac79c6bc..258dfcb04 100644 --- a/_support/test-cluster/gitaly1/etc-gitlab/gitlab.rb +++ b/_support/test-cluster/gitaly1/etc-gitlab/gitlab.rb @@ -18,3 +18,5 @@ nginx['enable'] = false gitlab_rails['rake_cache_clear'] = false gitlab_rails['auto_migrate'] = false +gitlab_rails['redis_host'] = 'app1' +gitlab_rails['redis_port'] = 6379 diff --git a/_support/test-cluster/gitaly2/etc-gitlab/gitlab.rb b/_support/test-cluster/gitaly2/etc-gitlab/gitlab.rb index 3e65f3e4c..dff87a391 100644 --- a/_support/test-cluster/gitaly2/etc-gitlab/gitlab.rb +++ b/_support/test-cluster/gitaly2/etc-gitlab/gitlab.rb @@ -21,3 +21,5 @@ nginx['enable'] = false gitlab_rails['rake_cache_clear'] = false gitlab_rails['auto_migrate'] = false +gitlab_rails['redis_host'] = 'app1' +gitlab_rails['redis_port'] = 6379 |