From 1a4e781173ab4135f8b309e3304c6e8715388cd6 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sat, 28 Mar 2020 12:58:58 -0500 Subject: [PATCH] Bind-mount acls dir to /home/gerrit2 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 --- playbooks/roles/gerrit/templates/manage-projects.j2 | 1 + playbooks/roles/gerrit/templates/projects.ini.j2 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/playbooks/roles/gerrit/templates/manage-projects.j2 b/playbooks/roles/gerrit/templates/manage-projects.j2 index aa68f41c75..d1ac4f0406 100644 --- a/playbooks/roles/gerrit/templates/manage-projects.j2 +++ b/playbooks/roles/gerrit/templates/manage-projects.j2 @@ -16,6 +16,7 @@ exec docker run --rm --net=host -u root \ -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/opt/lib/git:/opt/lib/git \ -v/opt/lib/jeepyb:/opt/lib/jeepyb \ diff --git a/playbooks/roles/gerrit/templates/projects.ini.j2 b/playbooks/roles/gerrit/templates/projects.ini.j2 index 20b0d505d6..fe45ab3224 100644 --- a/playbooks/roles/gerrit/templates/projects.ini.j2 +++ b/playbooks/roles/gerrit/templates/projects.ini.j2 @@ -1,6 +1,6 @@ [projects] homepage=https://opendev.org -acl-dir=/opt/project-config/gerrit/acls +acl-dir=/home/gerrit2/acls local-git-dir=/opt/lib/git jeepyb-cache-dir=/opt/lib/jeepyb gerrit-host={{ gerrit_vhost_name }}