Commit 253997e1 authored by Evan Read's avatar Evan Read

Merge branch 'patch-60' into 'master'

Update order of list to match HA setup order

See merge request gitlab-org/gitlab-ce!28429
parents 029d68d3 76c819b0
...@@ -64,8 +64,8 @@ larger one. ...@@ -64,8 +64,8 @@ larger one.
- 1 PostgreSQL node - 1 PostgreSQL node
- 1 Redis node - 1 Redis node
- 2 or more GitLab application nodes (Unicorn, Workhorse, Sidekiq)
- 1 NFS/Gitaly storage server - 1 NFS/Gitaly storage server
- 2 or more GitLab application nodes (Unicorn, Workhorse, Sidekiq)
#### Installation Instructions #### Installation Instructions
...@@ -88,9 +88,9 @@ in size, indicating that there is contention or not enough resources. ...@@ -88,9 +88,9 @@ in size, indicating that there is contention or not enough resources.
- 1 PostgreSQL node - 1 PostgreSQL node
- 1 Redis node - 1 Redis node
- 2 or more GitLab application nodes (Unicorn, Workhorse)
- 2 or more Sidekiq nodes
- 2 or more NFS/Gitaly storage servers - 2 or more NFS/Gitaly storage servers
- 2 or more Sidekiq nodes
- 2 or more GitLab application nodes (Unicorn, Workhorse)
## High Availability Architecture Examples ## High Availability Architecture Examples
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment