diff --git a/playbooks/roles/gerrit/templates/secure.config.j2 b/playbooks/roles/gerrit/templates/secure.config.j2 index 88d7a64742..dc0ed39b94 100644 --- a/playbooks/roles/gerrit/templates/secure.config.j2 +++ b/playbooks/roles/gerrit/templates/secure.config.j2 @@ -4,10 +4,7 @@ {% endif %} {% if gerrit_reviewdb_database_type == 'mariadb_container' %} [accountPatchReviewDb] -# NOTE(ianw) 2021-07-19 : the mariadb connector throws errors because -# it doesn't seem to handle duplicate key detection. Investigation -# upstream TBC. - url = jdbc:mysql://127.0.0.1:3306/{{ gerrit_reviewdb_mariadb_dbname }}?sessionVariables=character_set_client=utf8,character_set_results=utf8,character_set_connection=utf8,collation_connection=utf8_unicode_ci,collation_database=utf8_unicode_ci,collation_server=utf8_unicode_ci&user={{ gerrit_reviewdb_mariadb_username }}&password={{ gerrit_reviewdb_mariadb_password }} + url = jdbc:mariadb://127.0.0.1:3306/{{ gerrit_reviewdb_mariadb_dbname }}?sessionVariables=character_set_client=utf8,character_set_results=utf8,character_set_connection=utf8,collation_connection=utf8_unicode_ci,collation_database=utf8_unicode_ci,collation_server=utf8_unicode_ci&user={{ gerrit_reviewdb_mariadb_username }}&password={{ gerrit_reviewdb_mariadb_password }} {% endif %} [auth] registerEmailPrivateKey = {{ gerrit_email_private_key }}