Commit 852ee281 authored by Catalin Irimie's avatar Catalin Irimie

Update Praefect virtual_storages format in ref architectures

The default => directly nodes format is deprecated, and we should
be using default => nodes => node{1,2,..}
parent 1d828594
...@@ -1582,19 +1582,20 @@ To configure the Praefect nodes, on each one: ...@@ -1582,19 +1582,20 @@ To configure the Praefect nodes, on each one:
# server ('praefect') and in git_data_dirs on Gitaly nodes ('gitaly-1') # server ('praefect') and in git_data_dirs on Gitaly nodes ('gitaly-1')
praefect['virtual_storages'] = { praefect['virtual_storages'] = {
'default' => { 'default' => {
'gitaly-1' => { 'nodes' => {
'address' => 'tcp://10.6.0.91:8075', 'gitaly-1' => {
'token' => '<praefect_internal_token>', 'address' => 'tcp://10.6.0.91:8075',
'primary' => true 'token' => '<praefect_internal_token>'
}, },
'gitaly-2' => { 'gitaly-2' => {
'address' => 'tcp://10.6.0.92:8075', 'address' => 'tcp://10.6.0.92:8075',
'token' => '<praefect_internal_token>' 'token' => '<praefect_internal_token>'
}, },
'gitaly-3' => { 'gitaly-3' => {
'address' => 'tcp://10.6.0.93:8075', 'address' => 'tcp://10.6.0.93:8075',
'token' => '<praefect_internal_token>' 'token' => '<praefect_internal_token>'
}, },
}
} }
} }
......
...@@ -1584,19 +1584,20 @@ To configure the Praefect nodes, on each one: ...@@ -1584,19 +1584,20 @@ To configure the Praefect nodes, on each one:
# server ('praefect') and in git_data_dirs on Gitaly nodes ('gitaly-1') # server ('praefect') and in git_data_dirs on Gitaly nodes ('gitaly-1')
praefect['virtual_storages'] = { praefect['virtual_storages'] = {
'default' => { 'default' => {
'gitaly-1' => { 'nodes' => {
'address' => 'tcp://10.6.0.91:8075', 'gitaly-1' => {
'token' => '<praefect_internal_token>', 'address' => 'tcp://10.6.0.91:8075',
'primary' => true 'token' => '<praefect_internal_token>'
}, },
'gitaly-2' => { 'gitaly-2' => {
'address' => 'tcp://10.6.0.92:8075', 'address' => 'tcp://10.6.0.92:8075',
'token' => '<praefect_internal_token>' 'token' => '<praefect_internal_token>'
}, },
'gitaly-3' => { 'gitaly-3' => {
'address' => 'tcp://10.6.0.93:8075', 'address' => 'tcp://10.6.0.93:8075',
'token' => '<praefect_internal_token>' 'token' => '<praefect_internal_token>'
}, },
}
} }
} }
......
...@@ -1282,19 +1282,20 @@ To configure the Praefect nodes, on each one: ...@@ -1282,19 +1282,20 @@ To configure the Praefect nodes, on each one:
# server ('praefect') and in git_data_dirs on Gitaly nodes ('gitaly-1') # server ('praefect') and in git_data_dirs on Gitaly nodes ('gitaly-1')
praefect['virtual_storages'] = { praefect['virtual_storages'] = {
'default' => { 'default' => {
'gitaly-1' => { 'nodes' => {
'address' => 'tcp://10.6.0.91:8075', 'gitaly-1' => {
'token' => '<praefect_internal_token>', 'address' => 'tcp://10.6.0.91:8075',
'primary' => true 'token' => '<praefect_internal_token>'
}, },
'gitaly-2' => { 'gitaly-2' => {
'address' => 'tcp://10.6.0.92:8075', 'address' => 'tcp://10.6.0.92:8075',
'token' => '<praefect_internal_token>' 'token' => '<praefect_internal_token>'
}, },
'gitaly-3' => { 'gitaly-3' => {
'address' => 'tcp://10.6.0.93:8075', 'address' => 'tcp://10.6.0.93:8075',
'token' => '<praefect_internal_token>' 'token' => '<praefect_internal_token>'
}, },
}
} }
} }
......
...@@ -1591,19 +1591,20 @@ To configure the Praefect nodes, on each one: ...@@ -1591,19 +1591,20 @@ To configure the Praefect nodes, on each one:
# server ('praefect') and in git_data_dirs on Gitaly nodes ('gitaly-1') # server ('praefect') and in git_data_dirs on Gitaly nodes ('gitaly-1')
praefect['virtual_storages'] = { praefect['virtual_storages'] = {
'default' => { 'default' => {
'gitaly-1' => { 'nodes' => {
'address' => 'tcp://10.6.0.91:8075', 'gitaly-1' => {
'token' => '<praefect_internal_token>', 'address' => 'tcp://10.6.0.91:8075',
'primary' => true 'token' => '<praefect_internal_token>'
}, },
'gitaly-2' => { 'gitaly-2' => {
'address' => 'tcp://10.6.0.92:8075', 'address' => 'tcp://10.6.0.92:8075',
'token' => '<praefect_internal_token>' 'token' => '<praefect_internal_token>'
}, },
'gitaly-3' => { 'gitaly-3' => {
'address' => 'tcp://10.6.0.93:8075', 'address' => 'tcp://10.6.0.93:8075',
'token' => '<praefect_internal_token>' 'token' => '<praefect_internal_token>'
}, },
}
} }
} }
......
...@@ -1273,19 +1273,20 @@ To configure the Praefect nodes, on each one: ...@@ -1273,19 +1273,20 @@ To configure the Praefect nodes, on each one:
# server ('praefect') and in git_data_dirs on Gitaly nodes ('gitaly-1') # server ('praefect') and in git_data_dirs on Gitaly nodes ('gitaly-1')
praefect['virtual_storages'] = { praefect['virtual_storages'] = {
'default' => { 'default' => {
'gitaly-1' => { 'nodes' => {
'address' => 'tcp://10.6.0.91:8075', 'gitaly-1' => {
'token' => '<praefect_internal_token>', 'address' => 'tcp://10.6.0.91:8075',
'primary' => true 'token' => '<praefect_internal_token>'
}, },
'gitaly-2' => { 'gitaly-2' => {
'address' => 'tcp://10.6.0.92:8075', 'address' => 'tcp://10.6.0.92:8075',
'token' => '<praefect_internal_token>' 'token' => '<praefect_internal_token>'
}, },
'gitaly-3' => { 'gitaly-3' => {
'address' => 'tcp://10.6.0.93:8075', 'address' => 'tcp://10.6.0.93:8075',
'token' => '<praefect_internal_token>' 'token' => '<praefect_internal_token>'
}, },
}
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment