Commit 7cdcda16 authored by Grant Young's avatar Grant Young

Add guidance on RA Object Storage

Also add to 2k
parent bc7e3a76
...@@ -1629,6 +1629,9 @@ To configure the Sidekiq nodes, on each one: ...@@ -1629,6 +1629,9 @@ To configure the Sidekiq nodes, on each one:
############################# #############################
### Object storage ### ### Object storage ###
############################# #############################
# This is an example for configuring Object Storage on GCP
# Replace this config with your chosen Object Storage provider as desired
gitlab_rails['object_store']['connection'] = { gitlab_rails['object_store']['connection'] = {
'provider' => 'Google', 'provider' => 'Google',
'google_project' => '<gcp-project-name>', 'google_project' => '<gcp-project-name>',
...@@ -1758,6 +1761,9 @@ On each node perform the following: ...@@ -1758,6 +1761,9 @@ On each node perform the following:
############################# #############################
### Object storage ### ### Object storage ###
############################# #############################
# This is an example for configuring Object Storage on GCP
# Replace this config with your chosen Object Storage provider as desired
gitlab_rails['object_store']['connection'] = { gitlab_rails['object_store']['connection'] = {
'provider' => 'Google', 'provider' => 'Google',
'google_project' => '<gcp-project-name>', 'google_project' => '<gcp-project-name>',
......
...@@ -1629,6 +1629,9 @@ To configure the Sidekiq nodes, on each one: ...@@ -1629,6 +1629,9 @@ To configure the Sidekiq nodes, on each one:
############################# #############################
### Object storage ### ### Object storage ###
############################# #############################
# This is an example for configuring Object Storage on GCP
# Replace this config with your chosen Object Storage provider as desired
gitlab_rails['object_store']['connection'] = { gitlab_rails['object_store']['connection'] = {
'provider' => 'Google', 'provider' => 'Google',
'google_project' => '<gcp-project-name>', 'google_project' => '<gcp-project-name>',
...@@ -1758,6 +1761,9 @@ On each node perform the following: ...@@ -1758,6 +1761,9 @@ On each node perform the following:
############################# #############################
### Object storage ### ### Object storage ###
############################# #############################
# This is an example for configuring Object Storage on GCP
# Replace this config with your chosen Object Storage provider as desired
gitlab_rails['object_store']['connection'] = { gitlab_rails['object_store']['connection'] = {
'provider' => 'Google', 'provider' => 'Google',
'google_project' => '<gcp-project-name>', 'google_project' => '<gcp-project-name>',
......
...@@ -669,6 +669,25 @@ On each node perform the following: ...@@ -669,6 +669,25 @@ On each node perform the following:
gitlab_rails['monitoring_whitelist'] = ['<MONITOR NODE IP>/32', '127.0.0.0/8'] gitlab_rails['monitoring_whitelist'] = ['<MONITOR NODE IP>/32', '127.0.0.0/8']
nginx['status']['options']['allow'] = ['<MONITOR NODE IP>/32', '127.0.0.0/8'] nginx['status']['options']['allow'] = ['<MONITOR NODE IP>/32', '127.0.0.0/8']
#############################
### Object storage ###
#############################
# This is an example for configuring Object Storage on GCP
# Replace this config with your chosen Object Storage provider as desired
gitlab_rails['object_store']['connection'] = {
'provider' => 'Google',
'google_project' => '<gcp-project-name>',
'google_json_key_location' => '<path-to-gcp-service-account-key>'
}
gitlab_rails['object_store']['objects']['artifacts']['bucket'] = "<gcp-bucket-name>"
gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = "<gcp-bucket-name>"
gitlab_rails['object_store']['objects']['lfs']['bucket'] = "<gcp-bucket-name>"
gitlab_rails['object_store']['objects']['uploads']['bucket'] = "<gcp-bucket-name>"
gitlab_rails['object_store']['objects']['packages']['bucket'] = "<gcp-bucket-name>"
gitlab_rails['object_store']['objects']['dependency_proxy']['bucket'] = "<gcp-bucket-name>"
gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = "<gcp-bucket-name>"
## Uncomment and edit the following options if you have set up NFS ## Uncomment and edit the following options if you have set up NFS
## ##
## Prevent GitLab from starting if NFS data mounts are not available ## Prevent GitLab from starting if NFS data mounts are not available
......
...@@ -1314,6 +1314,9 @@ To configure the Sidekiq nodes, one each one: ...@@ -1314,6 +1314,9 @@ To configure the Sidekiq nodes, one each one:
############################# #############################
### Object storage ### ### Object storage ###
############################# #############################
# This is an example for configuring Object Storage on GCP
# Replace this config with your chosen Object Storage provider as desired
gitlab_rails['object_store']['connection'] = { gitlab_rails['object_store']['connection'] = {
'provider' => 'Google', 'provider' => 'Google',
'google_project' => '<gcp-project-name>', 'google_project' => '<gcp-project-name>',
...@@ -1478,6 +1481,9 @@ On each node perform the following: ...@@ -1478,6 +1481,9 @@ On each node perform the following:
############################# #############################
### Object storage ### ### Object storage ###
############################# #############################
# This is an example for configuring Object Storage on GCP
# Replace this config with your chosen Object Storage provider as desired
gitlab_rails['object_store']['connection'] = { gitlab_rails['object_store']['connection'] = {
'provider' => 'Google', 'provider' => 'Google',
'google_project' => '<gcp-project-name>', 'google_project' => '<gcp-project-name>',
......
...@@ -1629,6 +1629,9 @@ To configure the Sidekiq nodes, on each one: ...@@ -1629,6 +1629,9 @@ To configure the Sidekiq nodes, on each one:
############################# #############################
### Object storage ### ### Object storage ###
############################# #############################
# This is an example for configuring Object Storage on GCP
# Replace this config with your chosen Object Storage provider as desired
gitlab_rails['object_store']['connection'] = { gitlab_rails['object_store']['connection'] = {
'provider' => 'Google', 'provider' => 'Google',
'google_project' => '<gcp-project-name>', 'google_project' => '<gcp-project-name>',
...@@ -1758,6 +1761,9 @@ On each node perform the following: ...@@ -1758,6 +1761,9 @@ On each node perform the following:
############################# #############################
### Object storage ### ### Object storage ###
############################# #############################
# This is an example for configuring Object Storage on GCP
# Replace this config with your chosen Object Storage provider as desired
gitlab_rails['object_store']['connection'] = { gitlab_rails['object_store']['connection'] = {
'provider' => 'Google', 'provider' => 'Google',
'google_project' => '<gcp-project-name>', 'google_project' => '<gcp-project-name>',
......
...@@ -1311,6 +1311,9 @@ To configure the Sidekiq nodes, one each one: ...@@ -1311,6 +1311,9 @@ To configure the Sidekiq nodes, one each one:
############################# #############################
### Object storage ### ### Object storage ###
############################# #############################
# This is an example for configuring Object Storage on GCP
# Replace this config with your chosen Object Storage provider as desired
gitlab_rails['object_store']['connection'] = { gitlab_rails['object_store']['connection'] = {
'provider' => 'Google', 'provider' => 'Google',
'google_project' => '<gcp-project-name>', 'google_project' => '<gcp-project-name>',
...@@ -1460,6 +1463,9 @@ On each node perform the following: ...@@ -1460,6 +1463,9 @@ On each node perform the following:
############################# #############################
### Object storage ### ### Object storage ###
############################# #############################
# This is an example for configuring Object Storage on GCP
# Replace this config with your chosen Object Storage provider as desired
gitlab_rails['object_store']['connection'] = { gitlab_rails['object_store']['connection'] = {
'provider' => 'Google', 'provider' => 'Google',
'google_project' => '<gcp-project-name>', 'google_project' => '<gcp-project-name>',
......
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