opendev/system-config
Code Issues Proposed changes

Merge "Remove reviewdb config from Gerrit"

Browse Source
This commit is contained in:
Zuul 2020-11-22 22:58:04 +00:00 committed by Gerrit Code Review
commit d755c64080
4 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
playbooks/roles/gerrit/files/hooks/patchset-created
View File

@ -7,11 +7,12 @@ export PROJECTS_YAML=/var/gerrit/etc/projects.yaml
export PROJECTS_INI=/var/gerrit/etc/projects.ini
# Use timeout to kill any process running longer than 10 minutes.
timeout -k 2m 10m /usr/local/bin/update-blueprint patchset-created "$@"
timeout -k 2m 10m /usr/local/bin/update-bug patchset-created "$@"
timeout -k 2m 10m /usr/local/bin/notify-impact patchset-created "$@" --impact SecurityImpact --dest-address 'openstack-security@lists.openstack.org'
if [ -f /var/gerrit/etc/ssh_welcome_rsa_key ] ; then
timeout -k 2m 10m /usr/local/bin/welcome-message patchset-created \
--verbose --ssh-user=welcome-message \
--ssh-key=/var/gerrit/etc/ssh_welcome_rsa_key "$@"
fi
# TODO: reenable these once jeepyb no longer relies on the old Gerrit DB
#timeout -k 2m 10m /usr/local/bin/update-blueprint patchset-created "$@"
#timeout -k 2m 10m /usr/local/bin/update-bug patchset-created "$@"
#if [ -f /var/gerrit/etc/ssh_welcome_rsa_key ] ; then
#timeout -k 2m 10m /usr/local/bin/welcome-message patchset-created \
# --verbose --ssh-user=welcome-message \
# --ssh-key=/var/gerrit/etc/ssh_welcome_rsa_key "$@"
#fi

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

@ -9,19 +9,6 @@
reportBugUrl = https://docs.openstack.org/infra/system-config/project.html#contributing
gitHttpUrl = https://{{ gerrit_vhost_name }}/
serverId = {{ gerrit_serverid }}
[database]
{% if gerrit_database_type == 'MYSQL' %}
type = MYSQL
hostname = {{ gerrit_mysql_host }}
database = reviewdb
username = gerrit2
url = jdbc:mysql://{{ gerrit_mysql_host }}/reviewdb?characterSetResults=utf8&characterEncoding=utf8&connectionCollation=utf8_bin&useUnicode=yes
poolLimit = 225
connectionpool = true
{% else %}
type = h2
database = tmp/reviewDb
{% endif %}
[auth]
contributorAgreements = true
type = OPENID_SSO

2
playbooks/roles/gerrit/templates/secure.config
View File

@ -1,6 +1,4 @@
{% if gerrit_database_type == 'MYSQL' %}
[database]
password = {{ gerrit_mysql_password }}
[accountPatchReviewDb]
url = jdbc:mysql://{{ gerrit_mysql_host }}:3306/accountPatchReviewDb?characterSetResults=utf8&characterEncoding=utf8&connectionCollation=utf8_bin&useUnicode=yes&user=gerrit2&password={{ gerrit_mysql_password }}
{% endif %}

2
playbooks/zuul/templates/group_vars/review-dev.yaml.j2
View File

@ -91,6 +91,6 @@ gerrit_run_init: true
gerrit_dev_storyboard_token: 4020000c-d1b9-4173-ab33-2f55dbc1c718
gerrit_dev_email_private_key: xxj2lTapostsobbxvpawhjhnzufaGxchrypoddcafqarrq5h
# These are here so that interpolation works in the main playbook. They
# are not actually used in the gerrit config.
# are not directly used in the gerrit config.
gerrit_dev_mysql_host: unused
gerrit_dev_mysql_password: unused