Merge branch 'tc-geo-object-storage-docs' into 'master'

Document GitLab Geo with Object Storage

Closes #3944

See merge request gitlab-org/gitlab-ee!3760

changelogs/unreleased-ee/tc-geo-object-storage-docs.yml

+---
+title: Document GitLab Geo with Object Storage
+merge_request: 3760
+author:
+type: other

doc/gitlab-geo/README.md

@@ -185,6 +185,11 @@ Read how to [update your Geo nodes to the latest GitLab version](updating_the_ge
 
 Read through the [Geo High Availability documentation](ha.md).
 
+## Configuring GitLab Geo with Object storage
+
+When you have object storage enabled, please consult the
+[Geo with Object Storage](object_storage.md) documentation.
+
 ## Current limitations
 
 - You cannot push code to secondary nodes

doc/gitlab-geo/object_storage.md

+# GitLab Geo with Object storage
+
+GitLab Geo can be used in combination with Object Storage (AWS S3, or
+other compatible object storage).
+
+## Configuration
+
+At this time it is required that if object storage is enabled on the
+primary, it must also be enabled on the secondary.
+
+The secondary nodes can use the same storage bucket as the primary, or
+they can use a replicated storage bucket. At this time GitLab does not
+take care of content replication in object storage.
+
+For LFS, follow the documentation to
+[set up LFS object storage](../workflow/lfs/lfs_administration.md#setting-up-s3-compatible-object-storage).
+
+For CI job artifacts, there is similar documentation to configure
+[jobs artifact object storage](../administration/job_artifacts.md#using-object-storage)
+
+Complete these steps on all nodes, primary **and** secondary.
+
+## Replication
+
+When using Amazon S3, you can use
+[CRR](https://docs.aws.amazon.com/AmazonS3/latest/dev/crr.html) to
+have automatic replication between the bucket used by the primary and
+the bucket used by the secondary.
+
+If you are using Google Cloud Storage, consider using
+[Multi-Regional Storage](https://cloud.google.com/storage/docs/storage-classes#multi-regional).
+Or you can use the [Storage Transfer Service](https://cloud.google.com/storage/transfer/),
+although this only supports daily synchronization.
+
+For manual synchronization, or scheduled by `cron`, please have a look at:
+
+- [`s3cmd sync`](http://s3tools.org/s3cmd-sync)
+- [`gsutil rsync`](https://cloud.google.com/storage/docs/gsutil/commands/rsync)

doc/workflow/git_lfs.md

@@ -47,8 +47,7 @@ In `config/gitlab.yml`:
 
 * Git LFS v1 original API is not supported since it was deprecated early in LFS development, starting with Git LFS version 0.6.0
 * When SSH is set as a remote, Git LFS objects still go through HTTPS
-* Any Git LFS request will ask for HTTPS credentials to be provided so good Git credentials store is recommended
-* Currently, storing GitLab Git LFS objects on a non-local storage (like S3 buckets) is not supported
+* Any Git LFS request will [ask for HTTPS credentials](#credentials-are-always-required-when-pushing-an-object)
 * Git LFS always assumes HTTPS so if you have GitLab server on HTTP you will have to add the URL to Git config manually (see #troubleshooting-tips)
 
 ## Using Git LFS
@@ -126,4 +125,4 @@ This will remember the credentials for an hour after which Git operations will r
 
 If you are using OS X you can use `osxkeychain` to store and encrypt your credentials. For Windows, `wincred` is available.
 
-More details about various methods of storing the user credentials can be found on [Git Credential Storage documentation](https://git-scm.com/book/en/v2/Git-Tools-Credential-Storage)
\ No newline at end of file
+More details about various methods of storing the user credentials can be found on [Git Credential Storage documentation](https://git-scm.com/book/en/v2/Git-Tools-Credential-Storage)

doc/workflow/lfs/lfs_administration.md

@@ -66,7 +66,7 @@ For source installations the following settings are nested under `lfs:` and then
 | `background_upload` | Set to false to disable automatic upload. Option may be removed once upload is direct to S3 | `true` |
 | `connection` | Various connection options described below | |
 
-#### S3 compatible connection settigns
+#### S3 compatible connection settings
 
 The connection settings match those provided by [Fog](https://github.com/fog), and are as follows:
 
@@ -114,7 +114,7 @@ The connection settings match those provided by [Fog](https://github.com/fog), a
 	will be forwarded to object storage unless
 	`gitlab_rails['lfs_object_store_background_upload']` is set to false.
 
-### In ombnibus
+### In Omnibus
 
 1. Edit `/etc/gitlab/gitlab.rb` and add the following lines by replacing with
    the values you want:
@@ -162,4 +162,4 @@ and [projects APIs](../../api/projects.md).
 [reconfigure gitlab]: ../../administration/restart_gitlab.md#omnibus-gitlab-reconfigure "How to reconfigure Omnibus GitLab"
 [restart gitlab]: ../../administration/restart_gitlab.md#installations-from-source "How to restart GitLab"
 [eep]: https://about.gitlab.com/gitlab-ee/ "GitLab Enterprise Edition Premium"
-[ee-2760]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2760
\ No newline at end of file
+[ee-2760]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2760