Commit 72fad99d authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

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

Update Praefect virtual_storages format in ref architectures

See merge request gitlab-org/gitlab!63443
parents d66f33e0 852ee281
......@@ -1582,10 +1582,10 @@ To configure the Praefect nodes, on each one:
# server ('praefect') and in git_data_dirs on Gitaly nodes ('gitaly-1')
praefect['virtual_storages'] = {
'default' => {
'nodes' => {
'gitaly-1' => {
'address' => 'tcp://10.6.0.91:8075',
'token' => '<praefect_internal_token>',
'primary' => true
'token' => '<praefect_internal_token>'
},
'gitaly-2' => {
'address' => 'tcp://10.6.0.92:8075',
......@@ -1597,6 +1597,7 @@ To configure the Praefect nodes, on each one:
},
}
}
}
# Set the network addresses that the exporters will listen on for monitoring
node_exporter['listen_address'] = '0.0.0.0:9100'
......
......@@ -1584,10 +1584,10 @@ To configure the Praefect nodes, on each one:
# server ('praefect') and in git_data_dirs on Gitaly nodes ('gitaly-1')
praefect['virtual_storages'] = {
'default' => {
'nodes' => {
'gitaly-1' => {
'address' => 'tcp://10.6.0.91:8075',
'token' => '<praefect_internal_token>',
'primary' => true
'token' => '<praefect_internal_token>'
},
'gitaly-2' => {
'address' => 'tcp://10.6.0.92:8075',
......@@ -1599,6 +1599,7 @@ To configure the Praefect nodes, on each one:
},
}
}
}
# Set the network addresses that the exporters will listen on for monitoring
node_exporter['listen_address'] = '0.0.0.0:9100'
......
......@@ -1282,10 +1282,10 @@ To configure the Praefect nodes, on each one:
# server ('praefect') and in git_data_dirs on Gitaly nodes ('gitaly-1')
praefect['virtual_storages'] = {
'default' => {
'nodes' => {
'gitaly-1' => {
'address' => 'tcp://10.6.0.91:8075',
'token' => '<praefect_internal_token>',
'primary' => true
'token' => '<praefect_internal_token>'
},
'gitaly-2' => {
'address' => 'tcp://10.6.0.92:8075',
......@@ -1297,6 +1297,7 @@ To configure the Praefect nodes, on each one:
},
}
}
}
# Set the network addresses that the exporters will listen on for monitoring
node_exporter['listen_address'] = '0.0.0.0:9100'
......
......@@ -1591,10 +1591,10 @@ To configure the Praefect nodes, on each one:
# server ('praefect') and in git_data_dirs on Gitaly nodes ('gitaly-1')
praefect['virtual_storages'] = {
'default' => {
'nodes' => {
'gitaly-1' => {
'address' => 'tcp://10.6.0.91:8075',
'token' => '<praefect_internal_token>',
'primary' => true
'token' => '<praefect_internal_token>'
},
'gitaly-2' => {
'address' => 'tcp://10.6.0.92:8075',
......@@ -1606,6 +1606,7 @@ To configure the Praefect nodes, on each one:
},
}
}
}
# Set the network addresses that the exporters will listen on for monitoring
node_exporter['listen_address'] = '0.0.0.0:9100'
......
......@@ -1273,10 +1273,10 @@ To configure the Praefect nodes, on each one:
# server ('praefect') and in git_data_dirs on Gitaly nodes ('gitaly-1')
praefect['virtual_storages'] = {
'default' => {
'nodes' => {
'gitaly-1' => {
'address' => 'tcp://10.6.0.91:8075',
'token' => '<praefect_internal_token>',
'primary' => true
'token' => '<praefect_internal_token>'
},
'gitaly-2' => {
'address' => 'tcp://10.6.0.92:8075',
......@@ -1288,6 +1288,7 @@ To configure the Praefect nodes, on each one:
},
}
}
}
# Set the network addresses that the exporters will listen on for monitoring
node_exporter['listen_address'] = '0.0.0.0:9100'
......
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