summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChenjerai Katanda <ckatanda@gitlab.com>2017-11-20 11:39:56 +0000
committerChenje Katanda <ckatanda@gitlab.com>2017-11-21 08:53:16 +0200
commit2788fa4c96da48025a048a7b29d806aaee9a362d (patch)
treee8c8ed1b4d3ff157c94e432cb9bfdb0ad06fcc23
parent9a8f094e34e9f6da5932f239a510abcd996a79b3 (diff)
downloadgitlab-ce-docs-ha-redis-roles-port.tar.gz
Port HA Redis roles from EEdocs-ha-redis-roles-port
-rw-r--r--doc/administration/high_availability/redis.md19
1 files changed, 12 insertions, 7 deletions
diff --git a/doc/administration/high_availability/redis.md b/doc/administration/high_availability/redis.md
index 0e92f7c5a34..a8273e922d7 100644
--- a/doc/administration/high_availability/redis.md
+++ b/doc/administration/high_availability/redis.md
@@ -268,9 +268,8 @@ The prerequisites for a HA Redis setup are the following:
1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby
- # Enable the master role and disable all other services in the machine
- # (you can still enable Sentinel).
- redis_master_role['enable'] = true
+ # Specify server role as 'redis_master_role'
+ 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.
@@ -296,6 +295,10 @@ The prerequisites for a HA Redis setup are the following:
1. [Reconfigure Omnibus GitLab][reconfigure] for the changes to take effect.
+> Note: 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/
+
### Step 2. Configuring the slave Redis instances
1. SSH into the **slave** Redis server.
@@ -308,10 +311,8 @@ The prerequisites for a HA Redis setup are the following:
1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
```ruby
- # Enable the slave role and disable all other services in the machine
- # (you can still enable Sentinel). This will also set automatically
- # `redis['master'] = false`.
- redis_slave_role['enable'] = true
+ # Specify server role as 'redis_slave_role'
+ 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.
@@ -345,6 +346,10 @@ The prerequisites for a HA Redis setup are the following:
1. [Reconfigure Omnibus GitLab][reconfigure] for the changes to take effect.
1. Go through the steps again for all the other slave nodes.
+> Note: 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/
+
---
These values don't have to be changed again in `/etc/gitlab/gitlab.rb` after