summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChenjerai Katanda <ckatanda@gitlab.com>2017-11-17 14:15:34 +0000
committerChenje Katanda <ckatanda@gitlab.com>2017-11-23 12:49:52 +0200
commit556336ba3acca3a9bb5f6dac05c7ef67d3a61684 (patch)
treeeee003a0f6661b5c2148a89f1a35695501c486bd
parent78170441c5f445e419ef1678344579a6d0164093 (diff)
downloadgitlab-ce-docs-port-ha-redis.tar.gz
Update docs to show use of high availability redis and sentinel rolesdocs-port-ha-redis
Add HA roles documentation to CE
-rw-r--r--doc/administration/high_availability/redis.md9
1 files changed, 8 insertions, 1 deletions
diff --git a/doc/administration/high_availability/redis.md b/doc/administration/high_availability/redis.md
index a8273e922d7..acdf30cef46 100644
--- a/doc/administration/high_availability/redis.md
+++ b/doc/administration/high_availability/redis.md
@@ -269,8 +269,11 @@ The prerequisites for a HA Redis setup are the following:
```ruby
# Specify server role as 'redis_master_role'
+ # You can specify multiple roles like sentinel and redis as: roles ['redis_sentinel_role', 'redis_master_role']
+ # Read more about high availability roles at https://docs.gitlab.com/omnibus/roles/
roles ['redis_master_role']
+
# IP address pointing to a local IP that the other machines can reach to.
# You can also set bind to '0.0.0.0' which listen in all interfaces.
# If you really need to bind to an external accessible IP, make
@@ -285,6 +288,7 @@ The prerequisites for a HA Redis setup are the following:
redis['password'] = 'redis-password-goes-here'
```
+
1. Only the primary GitLab application server should handle migrations. To
prevent database migrations from running on upgrade, add the following
configuration to your `/etc/gitlab/gitlab.rb` file:
@@ -312,8 +316,11 @@ The prerequisites for a HA Redis setup are the following:
```ruby
# Specify server role as 'redis_slave_role'
+ # You can specify multiple roles like sentinel and redis as: roles ['redis_sentinel_role', 'redis_slave_role']
+ # Read more about high availability roles at https://docs.gitlab.com/omnibus/roles/
roles ['redis_slave_role']
+
# IP address pointing to a local IP that the other machines can reach to.
# You can also set bind to '0.0.0.0' which listen in all interfaces.
# If you really need to bind to an external accessible IP, make
@@ -397,7 +404,7 @@ multiple machines with the Sentinel daemon.
be duplicate below):
```ruby
- redis_sentinel_role['enable'] = true
+ roles ['redis_sentinel_role']
# Must be the same in every sentinel node
redis['master_name'] = 'gitlab-redis'