opendev/system-config
Code Issues Proposed changes

Bind-mount acls dir to /home/gerrit2

Browse Source 
Turns out our config has a bunch of hardcoded /home/gerrit2/acls
entries in it. That doesn't work if we're just pointing the
config file at /opt/project-config/gerrit/acls.

Change-Id: I387e446501e17a3bdd807807d5ef6b69b53abde5
This commit is contained in:
Monty Taylor 2020-03-28 12:58:58 -05:00
parent 1be28fddf3
commit 1a4e781173
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,7 @@
exec docker run --rm --net=host -u root \ exec docker run --rm --net=host -u root \
-v{{ gerrit_project_config_base }}:/opt/project-config \ -v{{ gerrit_project_config_base }}:/opt/project-config \
-v{{ gerrit_project_config_base }}/acls:/home/gerrit2/acls \
-v{{ gerrit_project_config_base }}/gerrit/projects.yaml:/home/gerrit2/projects.yaml \ -v{{ gerrit_project_config_base }}/gerrit/projects.yaml:/home/gerrit2/projects.yaml \
-v/opt/lib/git:/opt/lib/git \ -v/opt/lib/git:/opt/lib/git \
-v/opt/lib/jeepyb:/opt/lib/jeepyb \ -v/opt/lib/jeepyb:/opt/lib/jeepyb \

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

@ -1,6 +1,6 @@
[projects] [projects]
homepage=https://opendev.org homepage=https://opendev.org
acl-dir=/opt/project-config/gerrit/acls acl-dir=/home/gerrit2/acls
local-git-dir=/opt/lib/git 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 }}