Merge branch 'cat-virtualstorages-refarch-format' into 'master'

Update Praefect virtual_storages format in ref architectures

See merge request gitlab-org/gitlab!63443

doc/administration/reference_architectures/10k_users.md

@@ -1582,19 +1582,20 @@ To configure the Praefect nodes, on each one:
    # server ('praefect') and in git_data_dirs on Gitaly nodes ('gitaly-1')
    praefect['virtual_storages'] = {
      'default' => {
-       'gitaly-1' => {
-         'address' => 'tcp://10.6.0.91:8075',
-         'token'   => '<praefect_internal_token>',
-         'primary' => true
-       },
-       'gitaly-2' => {
-         'address' => 'tcp://10.6.0.92:8075',
-         'token'   => '<praefect_internal_token>'
-       },
-       'gitaly-3' => {
-         'address' => 'tcp://10.6.0.93:8075',
-         'token'   => '<praefect_internal_token>'
-       },
+       'nodes' => {
+         'gitaly-1' => {
+           'address' => 'tcp://10.6.0.91:8075',
+           'token'   => '<praefect_internal_token>'
+         },
+         'gitaly-2' => {
+           'address' => 'tcp://10.6.0.92:8075',
+           'token'   => '<praefect_internal_token>'
+         },
+         'gitaly-3' => {
+           'address' => 'tcp://10.6.0.93:8075',
+           'token'   => '<praefect_internal_token>'
+         },
+       }
      }
    }
 

doc/administration/reference_architectures/25k_users.md

@@ -1584,19 +1584,20 @@ To configure the Praefect nodes, on each one:
    # server ('praefect') and in git_data_dirs on Gitaly nodes ('gitaly-1')
    praefect['virtual_storages'] = {
      'default' => {
-       'gitaly-1' => {
-         'address' => 'tcp://10.6.0.91:8075',
-         'token'   => '<praefect_internal_token>',
-         'primary' => true
-       },
-       'gitaly-2' => {
-         'address' => 'tcp://10.6.0.92:8075',
-         'token'   => '<praefect_internal_token>'
-       },
-       'gitaly-3' => {
-         'address' => 'tcp://10.6.0.93:8075',
-         'token'   => '<praefect_internal_token>'
-       },
+       'nodes' => {
+         'gitaly-1' => {
+           'address' => 'tcp://10.6.0.91:8075',
+           'token'   => '<praefect_internal_token>'
+         },
+         'gitaly-2' => {
+           'address' => 'tcp://10.6.0.92:8075',
+           'token'   => '<praefect_internal_token>'
+         },
+         'gitaly-3' => {
+           'address' => 'tcp://10.6.0.93:8075',
+           'token'   => '<praefect_internal_token>'
+         },
+       }
      }
    }
 

doc/administration/reference_architectures/3k_users.md

@@ -1282,19 +1282,20 @@ To configure the Praefect nodes, on each one:
    # server ('praefect') and in git_data_dirs on Gitaly nodes ('gitaly-1')
    praefect['virtual_storages'] = {
      'default' => {
-       'gitaly-1' => {
-         'address' => 'tcp://10.6.0.91:8075',
-         'token'   => '<praefect_internal_token>',
-         'primary' => true
-       },
-       'gitaly-2' => {
-         'address' => 'tcp://10.6.0.92:8075',
-         'token'   => '<praefect_internal_token>'
-       },
-       'gitaly-3' => {
-         'address' => 'tcp://10.6.0.93:8075',
-         'token'   => '<praefect_internal_token>'
-       },
+       'nodes' => {
+         'gitaly-1' => {
+           'address' => 'tcp://10.6.0.91:8075',
+           'token'   => '<praefect_internal_token>'
+         },
+         'gitaly-2' => {
+           'address' => 'tcp://10.6.0.92:8075',
+           'token'   => '<praefect_internal_token>'
+         },
+         'gitaly-3' => {
+           'address' => 'tcp://10.6.0.93:8075',
+           'token'   => '<praefect_internal_token>'
+         },
+       }
      }
    }
 

doc/administration/reference_architectures/50k_users.md

@@ -1591,19 +1591,20 @@ To configure the Praefect nodes, on each one:
    # server ('praefect') and in git_data_dirs on Gitaly nodes ('gitaly-1')
    praefect['virtual_storages'] = {
      'default' => {
-       'gitaly-1' => {
-         'address' => 'tcp://10.6.0.91:8075',
-         'token'   => '<praefect_internal_token>',
-         'primary' => true
-       },
-       'gitaly-2' => {
-         'address' => 'tcp://10.6.0.92:8075',
-         'token'   => '<praefect_internal_token>'
-       },
-       'gitaly-3' => {
-         'address' => 'tcp://10.6.0.93:8075',
-         'token'   => '<praefect_internal_token>'
-       },
+       'nodes' => {
+         'gitaly-1' => {
+           'address' => 'tcp://10.6.0.91:8075',
+           'token'   => '<praefect_internal_token>'
+         },
+         'gitaly-2' => {
+           'address' => 'tcp://10.6.0.92:8075',
+           'token'   => '<praefect_internal_token>'
+         },
+         'gitaly-3' => {
+           'address' => 'tcp://10.6.0.93:8075',
+           'token'   => '<praefect_internal_token>'
+         },
+       }
      }
    }
 

doc/administration/reference_architectures/5k_users.md

@@ -1273,19 +1273,20 @@ To configure the Praefect nodes, on each one:
    # server ('praefect') and in git_data_dirs on Gitaly nodes ('gitaly-1')
    praefect['virtual_storages'] = {
      'default' => {
-       'gitaly-1' => {
-         'address' => 'tcp://10.6.0.91:8075',
-         'token'   => '<praefect_internal_token>',
-         'primary' => true
-       },
-       'gitaly-2' => {
-         'address' => 'tcp://10.6.0.92:8075',
-         'token'   => '<praefect_internal_token>'
-       },
-       'gitaly-3' => {
-         'address' => 'tcp://10.6.0.93:8075',
-         'token'   => '<praefect_internal_token>'
-       },
+       'nodes' => {
+         'gitaly-1' => {
+           'address' => 'tcp://10.6.0.91:8075',
+           'token'   => '<praefect_internal_token>'
+         },
+         'gitaly-2' => {
+           'address' => 'tcp://10.6.0.92:8075',
+           'token'   => '<praefect_internal_token>'
+         },
+         'gitaly-3' => {
+           'address' => 'tcp://10.6.0.93:8075',
+           'token'   => '<praefect_internal_token>'
+         },
+       }
      }
    }