opendev/system-config
Code Issues Proposed changes

Stop managing gerrit's local git mirror dir

Browse Source 
We stopped serving this content and the next step is to stop managing it
internally. This depends on a change to jeepyb that makes the local git
dir management on the jeepyb side optional. Once that lands we can
update our configs to tell jeepyb to stop managing it.

We also stop doing garbage collection, mounting it into containers that
don't need it, etc.

Depends-On: https://review.opendev.org/758597
Change-Id: I2185e90edfcac71941bc29a4e11b7b2d4c7c2e13
This commit is contained in:
Clark Boylan 2020-10-16 09:39:31 -07:00
parent ef94bf7645
commit 9011096d49
7 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/source/jeepyb.rst
View File

@ -44,7 +44,6 @@ connect to things or how to operate is in
[projects] [projects]
homepage=http://example.org homepage=http://example.org
local-git-dir=/var/lib/git
gerrit-host=review.example.org gerrit-host=review.example.org
gerrit-user=example-project-creator gerrit-user=example-project-creator
gerrit-key=/home/gerrit2/.ssh/example_project_id_rsa gerrit-key=/home/gerrit2/.ssh/example_project_id_rsa

4
playbooks/rename_repos.yaml
View File

@ -26,13 +26,13 @@
owner: gerrit2 owner: gerrit2
mode: 0755 mode: 0755
with_nested: with_nested:
- [ '~gerrit2/review_site/git/', '/opt/lib/git/' ] - [ '~gerrit2/review_site/git/' ]
- "{{ repos }}" - "{{ repos }}"
- name: Rename git repos on gerrit - name: Rename git repos on gerrit
shell: mv {{ item[0] }}{{ item[1].old }}.git {{ item[0] }}{{ item[1].new }}.git shell: mv {{ item[0] }}{{ item[1].old }}.git {{ item[0] }}{{ item[1].new }}.git
with_nested: with_nested:
- [ '~gerrit2/review_site/git/', '/opt/lib/git/' ] - [ '~gerrit2/review_site/git/' ]
- "{{ repos }}" - "{{ repos }}"
- hosts: gitea - hosts: gitea

1
playbooks/roles/gerrit/defaults/main.yaml
View File

@ -19,7 +19,6 @@ gerrit_container_volumes:
- /home/gerrit2/.ssh:/var/gerrit/.ssh - /home/gerrit2/.ssh:/var/gerrit/.ssh
- /opt/project-config/gerrit/projects.yaml:/var/gerrit/etc/projects.yaml - /opt/project-config/gerrit/projects.yaml:/var/gerrit/etc/projects.yaml
- /opt/project-config/gerrit/projects.ini:/var/gerrit/etc/projects.ini - /opt/project-config/gerrit/projects.ini:/var/gerrit/etc/projects.ini
- /opt/lib/git:/opt/lib/git
gerrit_database_type: MYSQL gerrit_database_type: MYSQL
gerrit_project_creator_user: openstack-project-creator gerrit_project_creator_user: openstack-project-creator
gerrit_manage_projects_args: "-v" gerrit_manage_projects_args: "-v"

2
playbooks/roles/gerrit/tasks/main.yaml
View File

@ -309,7 +309,7 @@
- name: Set up cron job to optmize local mirror git repos - name: Set up cron job to optmize local mirror git repos
cron: cron:
name: optmize-local-git-repos name: optmize-local-git-repos
state: present state: absent
user: gerrit2 user: gerrit2
job: 'find /opt/lib/git/ -type d -name "*.git" -print -exec git --git-dir="{}" gc \;' job: 'find /opt/lib/git/ -type d -name "*.git" -print -exec git --git-dir="{}" gc \;'
minute: 17 minute: 17

1
playbooks/roles/gerrit/templates/manage-projects.j2
View File

@ -18,7 +18,6 @@ exec docker run --rm --net=host -u root \
-v/opt/project-config:/opt/project-config \ -v/opt/project-config:/opt/project-config \
-v/opt/project-config/gerrit/acls:/home/gerrit2/acls \ -v/opt/project-config/gerrit/acls:/home/gerrit2/acls \
-v/opt/project-config/gerrit/projects.yaml:/home/gerrit2/projects.yaml \ -v/opt/project-config/gerrit/projects.yaml:/home/gerrit2/projects.yaml \
-v/opt/lib/git:/opt/lib/git \
-v/opt/lib/jeepyb:/opt/lib/jeepyb \ -v/opt/lib/jeepyb:/opt/lib/jeepyb \
-v/home/gerrit2/review_site/etc/ssh_project_rsa_key:/home/gerrit2/review_site/etc/ssh_project_rsa_key \ -v/home/gerrit2/review_site/etc/ssh_project_rsa_key:/home/gerrit2/review_site/etc/ssh_project_rsa_key \
-v/home/gerrit2/projects.ini:/home/gerrit2/projects.ini \ -v/home/gerrit2/projects.ini:/home/gerrit2/projects.ini \

1
playbooks/roles/gerrit/templates/projects.ini.j2
View File

@ -1,7 +1,6 @@
[projects] [projects]
homepage=https://opendev.org homepage=https://opendev.org
acl-dir=/home/gerrit2/acls acl-dir=/home/gerrit2/acls
local-git-dir=/opt/lib/git
jeepyb-cache-dir=/opt/lib/jeepyb jeepyb-cache-dir=/opt/lib/jeepyb
gerrit-host={{ gerrit_vhost_name }} gerrit-host={{ gerrit_vhost_name }}
gerrit-user={{ gerrit_project_creator_user }} gerrit-user={{ gerrit_project_creator_user }}

1
playbooks/roles/gerrit/templates/track-upstream.j2
View File

@ -17,7 +17,6 @@
exec docker run --rm --net=host -u root \ exec docker run --rm --net=host -u root \
-v/opt/project-config:/opt/project-config \ -v/opt/project-config:/opt/project-config \
-v/opt/project-config/gerrit/projects.yaml:/home/gerrit2/projects.yaml \ -v/opt/project-config/gerrit/projects.yaml:/home/gerrit2/projects.yaml \
-v/opt/lib/git:/opt/lib/git \
-v/opt/lib/jeepyb:/opt/lib/jeepyb \ -v/opt/lib/jeepyb:/opt/lib/jeepyb \
-v/home/gerrit2/review_site/etc/ssh_project_rsa_key:/home/gerrit2/review_site/etc/ssh_project_rsa_key \ -v/home/gerrit2/review_site/etc/ssh_project_rsa_key:/home/gerrit2/review_site/etc/ssh_project_rsa_key \
-v/home/gerrit2/projects.ini:/home/gerrit2/projects.ini \ -v/home/gerrit2/projects.ini:/home/gerrit2/projects.ini \