opendev/system-config
Code Issues Proposed changes

Set gerrit.serverId in gerrit.config

Browse Source 
This serverId value is used by notedb to identify the gerrit cluster
that notedb contents belong to. By default a random uuid is generated by
gerrit for this value. In order to avoid config management and gerrit
fighting over this value after we upgrade we set a value now.

This should be safe to land on 2.13 as old gerrit should ignore the
value.

Change-Id: I57c9b436a9d0d1dfe77eee907d50fc1dcda6ab12
This commit is contained in:
Clark Boylan 2020-11-10 10:24:51 -08:00
parent 2a85185bbc
commit b9b1cba959
4 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
inventory/service/host_vars/review-dev01.opendev.org.yaml
View File

@ -8,6 +8,7 @@ letsencrypt_certs:
letsencrypt_gid: 3001 letsencrypt_gid: 3001
gerrit_storyboard_url: https://storyboard-dev.openstack.org gerrit_storyboard_url: https://storyboard-dev.openstack.org
gerrit_vhost_name: review-dev.opendev.org gerrit_vhost_name: review-dev.opendev.org
gerrit_serverid: eab9c642-ec65-4bed-95be-8ca1b11d212c
gerrit_redirect_vhost: review-dev.openstack.org gerrit_redirect_vhost: review-dev.openstack.org
gerrit_project_creator_user: openstack-dev-project-creator gerrit_project_creator_user: openstack-dev-project-creator
gerrit_self_hostkey: '[review-dev.opendev.org]:29418,[review-dev.openstack.org]:29418,[23.253.109.153]:29418,[2001:4800:7819:104:be76:4eff:fe04:8e55]:29418 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC4J4BJ/C6kl1PcfD5ZdpYIwWXA+vRiB4USncZQHW9+Idtdr4dZRA05RlBAfiTkKKhjarJpt8PQP2hYt8aJL1miZZjp1s05d9mxGVHfoH7Vyg85vhRa7Jg4VZS0cu34R909q23cBcjSNQSyVKP9neOqovoV/DyB8HHEg0kbsOWC3qzdA+6aVdVV7Mtx/0t0MyiTz0xA5ZCRFwF6IuiMPHLNk128qDhjO2UXnrhyP5A7Kl/JHpIWToLKGIorePndFcFyNXlWIhBoQRDcX6FYjPdavjAGlK1S/Jd5DVJ184Z7rEXL682o487c0NQ/lAV4QF3iz0Aw9QRVrUw21xWvfU4R' gerrit_self_hostkey: '[review-dev.opendev.org]:29418,[review-dev.openstack.org]:29418,[23.253.109.153]:29418,[2001:4800:7819:104:be76:4eff:fe04:8e55]:29418 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC4J4BJ/C6kl1PcfD5ZdpYIwWXA+vRiB4USncZQHW9+Idtdr4dZRA05RlBAfiTkKKhjarJpt8PQP2hYt8aJL1miZZjp1s05d9mxGVHfoH7Vyg85vhRa7Jg4VZS0cu34R909q23cBcjSNQSyVKP9neOqovoV/DyB8HHEg0kbsOWC3qzdA+6aVdVV7Mtx/0t0MyiTz0xA5ZCRFwF6IuiMPHLNk128qDhjO2UXnrhyP5A7Kl/JHpIWToLKGIorePndFcFyNXlWIhBoQRDcX6FYjPdavjAGlK1S/Jd5DVJ184Z7rEXL682o487c0NQ/lAV4QF3iz0Aw9QRVrUw21xWvfU4R'

1
inventory/service/host_vars/review-test.opendev.org.yaml
View File

@ -1,6 +1,7 @@
gerrit_replication: [] gerrit_replication: []
gerrit_storyboard_url: https://storyboard.openstack.org gerrit_storyboard_url: https://storyboard.openstack.org
gerrit_vhost_name: review-test.opendev.org gerrit_vhost_name: review-test.opendev.org
gerrit_serverid: adf32efa-43c9-4163-b047-c4449d8997da
gerrit_heap_limit: 48g gerrit_heap_limit: 48g
gerrit_track_upstream: false gerrit_track_upstream: false
letsencrypt_certs: letsencrypt_certs:

1
inventory/service/host_vars/review01.openstack.org.yaml
View File

@ -57,6 +57,7 @@ gerrit_replication:
threads: '4' threads: '4'
gerrit_storyboard_url: https://storyboard.openstack.org gerrit_storyboard_url: https://storyboard.openstack.org
gerrit_vhost_name: review.opendev.org gerrit_vhost_name: review.opendev.org
gerrit_serverid: 4a232e18-c5a9-48ee-94c0-e04e7cca6543
gerrit_redirect_vhost: review.openstack.org gerrit_redirect_vhost: review.openstack.org
gerrit_heap_limit: 48g gerrit_heap_limit: 48g
letsencrypt_certs: letsencrypt_certs:

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

@ -8,6 +8,7 @@
reportBugText = Get Help reportBugText = Get Help
reportBugUrl = https://docs.openstack.org/infra/system-config/project.html#contributing reportBugUrl = https://docs.openstack.org/infra/system-config/project.html#contributing
gitHttpUrl = https://{{ gerrit_vhost_name }}/ gitHttpUrl = https://{{ gerrit_vhost_name }}/
serverId = {{ gerrit_serverid }}
[database] [database]
{% if gerrit_database_type == 'MYSQL' %} {% if gerrit_database_type == 'MYSQL' %}
type = MYSQL type = MYSQL