opendev/system-config
Code Issues Proposed changes

Merge "Omnibus Gerrit 3.2 changes"

Browse Source
This commit is contained in:
fungi.admin 2020-11-21 17:19:58 +00:00 committed by Gerrit Code Review
commit 2197f11a0f
4 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
inventory/service/group_vars/zuul.yaml
View File

@ -21,7 +21,6 @@ zuul_connections:
user: 'zuul' user: 'zuul'
sshkey: '/var/lib/zuul/ssh/id_rsa' sshkey: '/var/lib/zuul/ssh/id_rsa'
gitweb_url_template: 'https://opendev.org/{project.name}/commit/{sha}' gitweb_url_template: 'https://opendev.org/{project.name}/commit/{sha}'
auth_type: 'digest'
- name: 'opendaylight' - name: 'opendaylight'
driver: 'gerrit' driver: 'gerrit'

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

@ -5,7 +5,7 @@ gerrit_site_dir: "{{ gerrit_home_dir }}/review_site"
gerrit_run_compose_up: false gerrit_run_compose_up: false
gerrit_run_init: false gerrit_run_init: false
gerrit_packed_git_open_files: 4096 gerrit_packed_git_open_files: 4096
gerrit_container_image: docker.io/opendevorg/gerrit:2.13 gerrit_container_image: docker.io/opendevorg/gerrit:3.2
gerrit_container_volumes: gerrit_container_volumes:
- /home/gerrit2/review_site/cache:/var/gerrit/cache - /home/gerrit2/review_site/cache:/var/gerrit/cache
- /home/gerrit2/review_site/etc:/var/gerrit/etc - /home/gerrit2/review_site/etc:/var/gerrit/etc

3
playbooks/roles/gerrit/templates/gerrit.config
View File

@ -39,6 +39,9 @@
{% if gerrit_heap_limit is defined %} {% if gerrit_heap_limit is defined %}
heapLimit = {{ gerrit_heap_limit }} heapLimit = {{ gerrit_heap_limit }}
{% endif %} {% endif %}
javaHome = /usr/local/openjdk-8/jre
javaOptions = "-Dflogger.backend_factory=com.google.common.flogger.backend.log4j.Log4jBackendFactory#getInstance"
javaOptions = "-Dflogger.logging_context=com.google.gerrit.server.logging.LoggingContext#getInstance"
[gc] [gc]
[core] [core]
packedGitOpenFiles = {{ gerrit_packed_git_open_files }} packedGitOpenFiles = {{ gerrit_packed_git_open_files }}

7
playbooks/roles/gerrit/templates/gerrit.vhost.j2
View File

@ -61,9 +61,6 @@
#RewriteCond %{REQUEST_URI} !^/maintenance.html$ #RewriteCond %{REQUEST_URI} !^/maintenance.html$
#RewriteRule ^/(.*) /maintenance.html [last,redirect=temporary] #RewriteRule ^/(.*) /maintenance.html [last,redirect=temporary]
# TODO remove this when upgrading to Gerrit 2.16. /p/ is used
# for project dashboards.
ProxyPassMatch ^/p/ !
ProxyPassMatch ^/robots.txt$ ! ProxyPassMatch ^/robots.txt$ !
ProxyPassMatch ^/server-status ! ProxyPassMatch ^/server-status !
# Comment out these two lines if the maintenance message above is in use # Comment out these two lines if the maintenance message above is in use
@ -72,10 +69,6 @@
Alias /robots.txt /home/gerrit2/review_site/static/robots.txt Alias /robots.txt /home/gerrit2/review_site/static/robots.txt
# TODO remove this when upgrading to Gerrit 2.16. /p/ is used
# for project dashboards.
RewriteRule "^/p/.*" "-" [F,L]
<Directory /home/gerrit2/review_site/git/> <Directory /home/gerrit2/review_site/git/>
Require all granted Require all granted
Order allow,deny Order allow,deny