[tor-commits] [dip/master] Update variables

[hiro at torproject.org]

commit 8b2d47daee0693c1a3490859d48e764da6a51f37
Author: hiro <hiro at torproject.org>
Date:   Mon Dec 9 17:18:35 2019 +0100

    Update variables
---
 inventories/prod/group_vars/all.yml  |  2 --
 inventories/test/group_vars/all.yml  |  2 --
 roles/gitlab/defaults/main.yml       |  1 +
 roles/gitlab/templates/gitlab.yml.j2 | 13 +++++++++++++
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/inventories/prod/group_vars/all.yml b/inventories/prod/group_vars/all.yml
index 0c38d7c..75528b3 100644
--- a/inventories/prod/group_vars/all.yml
+++ b/inventories/prod/group_vars/all.yml
@@ -4,7 +4,5 @@ external_domain_pages: pages.dip.torproject.org
 external_domain_registry: registry.dip.torproject.org
 external_domain_logs: logs.dip.torproject.org
 ldapsync_filter: (supplementaryGid=TorProject)
-gitlab_storage_lfs: torproject-dip-prod-gitlab-lfs
-gitlab_storage_artifacts:
 ldap_org: torproject
 ldap_host: db.torproject.org
diff --git a/inventories/test/group_vars/all.yml b/inventories/test/group_vars/all.yml
index 0c38d7c..75528b3 100644
--- a/inventories/test/group_vars/all.yml
+++ b/inventories/test/group_vars/all.yml
@@ -4,7 +4,5 @@ external_domain_pages: pages.dip.torproject.org
 external_domain_registry: registry.dip.torproject.org
 external_domain_logs: logs.dip.torproject.org
 ldapsync_filter: (supplementaryGid=TorProject)
-gitlab_storage_lfs: torproject-dip-prod-gitlab-lfs
-gitlab_storage_artifacts:
 ldap_org: torproject
 ldap_host: db.torproject.org
diff --git a/roles/gitlab/defaults/main.yml b/roles/gitlab/defaults/main.yml
index b95ec25..09cfb48 100644
--- a/roles/gitlab/defaults/main.yml
+++ b/roles/gitlab/defaults/main.yml
@@ -1,4 +1,5 @@
 ---
 gitlab_home: ~/gitlab
 gitlab_omniauth_providers: []
+gitlab_storage_artifacts:
 gitlab_storage_lfs:
diff --git a/roles/gitlab/templates/gitlab.yml.j2 b/roles/gitlab/templates/gitlab.yml.j2
index 2c3add0..79f0dd0 100644
--- a/roles/gitlab/templates/gitlab.yml.j2
+++ b/roles/gitlab/templates/gitlab.yml.j2
@@ -152,8 +152,21 @@ production: &base
   ## Build Artifacts
   artifacts:
     enabled: true
+{% if gitlab_storage_artifacts %}
+    object_store:
+      enabled: true
+      remote_directory: {{ gitlab_storage_artifacts }}
+      direct_upload: true
+      proxy_download: true
+      connection:
+        provider: Google
+        google_project: {{ google_service_account.project_id }}
+        google_client_email: {{ google_service_account.client_email }}
+        google_json_key_location: config/storage.json
+{% else %}
     object_store:
       enabled: false
+{% endif %}
 
   ## Merge request external diff storage
   external_diffs: