diff options
| author | Chenjerai Katanda <ckatanda@gitlab.com> | 2017-11-23 09:17:09 +0000 |
|---|---|---|
| committer | Chenjerai Katanda <ckatanda@gitlab.com> | 2017-11-23 09:17:09 +0000 |
| commit | 9549726ff0dc519e265259f919ce5cf213d50257 (patch) | |
| tree | 2f7fc20ceb65101c29f215c89b0b1dcc5f0dde33 | |
| parent | 9b21f49508e7ba64c699fa7ad46f457e56d9ba16 (diff) | |
| download | gitlab-ce-9549726ff0dc519e265259f919ce5cf213d50257.tar.gz | |
Add redis and sentinel HA roles to CE docs
| -rw-r--r-- | doc/administration/high_availability/redis.md | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/doc/administration/high_availability/redis.md b/doc/administration/high_availability/redis.md index 0e92f7c5a34..1641022dedc 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 @@ -392,7 +397,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' |