Standardize Geo role setting

doc/administration/geo/disaster_recovery/index.md

@@ -96,7 +96,7 @@ must disable the primary.
 
     ```ruby
     ## REMOVE THIS LINE
-    geo_secondary_role['enable'] = true
+    roles ['geo_secondary_role']
     ```
 
     A new secondary should not be added at this time. If you want to add a new
@@ -125,7 +125,7 @@ The command above does the following changes:
 - Executes `gitlab-ctl reconfigure` to apply the changes in `/etc/gitlab/gitlab.rb`
 - Runs `gitlab-rake geo:set_secondary_as_primary`
 
-You need to make sure all the affected machines no longer have `geo_secondary_role['enable'] = true` in
+You need to make sure all the affected machines no longer have `roles ['geo_secondary_role']` in
 `/etc/gitlab/gitlab.rb`, that you execute the database promotion on the required database nodes
 and you execute the `gitlab-rake geo:set_secondary_as_primary` in a machine running the application server.
 
@@ -198,7 +198,7 @@ and after that you also need two extra steps.
 
     ```ruby
     ## Enable a Geo Primary role (if you haven't yet)
-    geo_primary_role['enable'] = true
+    roles ['geo_primary_role']
 
     ##
     # Primary and Secondary addresses

doc/administration/geo/replication/database.md

@@ -161,7 +161,7 @@ The following guide assumes that:
     ## Geo Primary role
     ## - configure dependent flags automatically to enable Geo
     ##
-    geo_primary_role['enable'] = true
+    roles ['geo_primary_role']
 
     ##
     ## Primary address
@@ -325,7 +325,7 @@ The following guide assumes that:
     ## Geo Secondary role
     ## - configure dependent flags automatically to enable Geo
     ##
-    geo_secondary_role['enable'] = true 
+    roles ['geo_secondary_role']
 
     ##
     ## Secondary address
@@ -348,7 +348,7 @@ The following guide assumes that:
     ```
 
     For external PostgreSQL instances, [see additional instructions][external postgresql].
-    If you bring a former primary back online to serve as a secondary then you also need to remove `geo_primary_role['enable'] = true`.
+    If you bring a former primary back online to serve as a secondary then you also need to remove `roles ['geo_primary_role']`.
 
 1. Reconfigure GitLab for the changes to take effect:
 

doc/administration/geo/replication/high_availability.md

@@ -51,7 +51,7 @@ This cluster will serve as the Geo Primary. Use the
     ##
     ## Enable the Geo primary role
     ##
-    geo_primary_role['enable'] = true
+    roles ['geo_primary_role']
 
     ##
     ## Disable automatic migrations
@@ -119,7 +119,7 @@ be specified.
     ##
     ## Enable the Geo secondary role
     ##
-    geo_secondary_role['enable'] = true
+    roles ['geo_secondary_role']
 
     ##
     ## Disable automatic migrations