commit 4ca6f5ae7feec4e494a6d96de431fade8d9278ae Author: hiro hiro@torproject.org Date: Mon Dec 9 16:44:17 2019 +0100

Fix inventory configuration --- inventories/prod/hosts | 25 +------------------------ inventories/test/group_vars/all.yml | 17 +++++++++-------- inventories/test/hosts | 23 +---------------------- 3 files changed, 11 insertions(+), 54 deletions(-)

diff --git a/inventories/prod/hosts b/inventories/prod/hosts index 9029e4d..348adae 100644 --- a/inventories/prod/hosts +++ b/inventories/prod/hosts @@ -1,25 +1,2 @@ -[system/logs] -salsa-logs.debian.net - -[system/runner] -salsa-runner.debian.net - [gitlab] -godard.debian.org ansible_connection=local - -[gitlab-pages] -salsa-pages.godard.debian.org ansible_connection=local ansible_become=True ansible_host=godard.debian.org ansible_become_user=salsa-pages - -[gitlab-runner] -salsa-runner.salsa-runner.debian.net ansible_host=salsa-runner.debian.net ansible_user=salsa-runner - -[salsa-webhook] -salsa-webhook.godard.debian.org ansible_connection=local ansible_become=True ansible_host=godard.debian.org ansible_become_user=salsa-webhook - -[docker-registry] -salsa-registry.godard.debian.org ansible_connection=local ansible_become=True ansible_host=godard.debian.org ansible_become_user=salsa-registry - -[runners] - -gitlabrunner2.debian.net ansible_user=root - +gitlab-01.torproject.org ansible_connection=local diff --git a/inventories/test/group_vars/all.yml b/inventories/test/group_vars/all.yml index d90ab9b..f25d011 100644 --- a/inventories/test/group_vars/all.yml +++ b/inventories/test/group_vars/all.yml @@ -1,9 +1,10 @@ --- -external_domain: salsa-test.debian.net -external_domain_logs: salsa-test-logs.debian.net -external_domain_pages: salsa-test-pages.debian.net -external_domain_registry: salsa-test-registry.debian.net -external_domain_webhook: salsa-test-webhook.debian.net -ldapsync_filter: (supplementaryGid=gitdoadm) -gitlab_storage_artifacts: debian-salsa-test-gitlab-artifacts -gitlab_storage_lfs: debian-salsa-test-gitlab-lfs +external_domain: dip.torproject.org +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_artifacts: torproject-dip-prod-gitlab-artifacts +gitlab_storage_lfs: torproject-dip-prod-gitlab-lfs +ldap_org: torproject +ldap_host: db.torproject.org diff --git a/inventories/test/hosts b/inventories/test/hosts index fbc8f9a..348adae 100644 --- a/inventories/test/hosts +++ b/inventories/test/hosts @@ -1,23 +1,2 @@ -[system/gitlab] -salsa-test.debian.net - -[system/logs] -salsa-test-logs.debian.net - -[system/runner] -salsa-test-runner.debian.net - [gitlab] -git.salsa-test.debian.net ansible_connection=local - -[gitlab-pages] -salsa-pages.salsa-test.debian.net ansible_connection=local ansible_become=True ansible_host=git.salsa-test.debian.net ansible_become_user=salsa-pages - -[gitlab-runner] -salsa-runner.salsa-test-runner.debian.net ansible_host=salsa-test-runner.debian.net ansible_user=salsa-runner - -[salsa-webhook] -salsa-webhook.salsa-test.debian.net ansible_connection=local ansible_become=True ansible_host=git.salsa-test.debian.net ansible_become_user=salsa-webhook - -[docker-registry] -salsa-registry.salsa-test.debian.net ansible_connection=local ansible_become=True ansible_host=git.salsa-test.debian.net ansible_become_user=salsa-registry +gitlab-01.torproject.org ansible_connection=local