Merge branch 'backup_storage_class' into 'master'

Add storage class configuration option for Amazon S3 remote backups

See merge request !1362

files/gitlab-config-template/gitlab.rb.template

@@ -245,6 +245,11 @@ external_url 'GENERATED_EXTERNAL_URL'
 ###!   backups**
 # gitlab_rails['backup_encryption'] = 'AES256'
 
+###! **Specifies Amazon S3 storage class to use for backups. Valid values
+###!   include 'STANDARD', 'STANDARD_IA', 'GLACIER', and 
+###!   'REDUCED_REDUNDANCY'**
+# gitlab_rails['backup_storage_class'] = 'STANDARD'
+
 ### For setting up different data storing directory
 ###! Docs: https://docs.gitlab.com/omnibus/settings/configuration.html#storing-git-data-in-an-alternative-directory
 ###! **If you want to use a single non-default directory to store git data use a

files/gitlab-cookbooks/gitlab/attributes/default.rb

@@ -193,6 +193,7 @@ default['gitlab']['gitlab-rails']['backup_upload_connection'] = nil
 default['gitlab']['gitlab-rails']['backup_upload_remote_directory'] = nil
 default['gitlab']['gitlab-rails']['backup_multipart_chunk_size'] = nil
 default['gitlab']['gitlab-rails']['backup_encryption'] = nil
+default['gitlab']['gitlab-rails']['backup_storage_class'] = nil
 # Path to the GitLab Shell installation
 # defaults to /opt/gitlab/embedded/service/gitlab-shell/. The install-dir path is set at build time
 default['gitlab']['gitlab-rails']['gitlab_shell_path'] = "#{node['package']['install-dir']}/embedded/service/gitlab-shell/"

files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb

@@ -368,6 +368,7 @@ production: &base
       remote_directory: <%= single_quote(@backup_upload_remote_directory) %>
       multipart_chunk_size: <%= @backup_multipart_chunk_size %>
       encryption: <%= @backup_encryption %>
+      storage_class: <%= @backup_storage_class %>
 
   ## GitLab Shell settings
   gitlab_shell: