Commit fa2b3d41 authored by Vincent Pelletier's avatar Vincent Pelletier

Revert "erp5.mariadb: Create no test database by default."

This reverts commit 37a0e975.

It was too early to change this default value, code requesting test
instance is not ready for this yet, which in turn prevents latest SR
improvements from being tested. Break the cycle by creating test databases
again. This code will go away again in the future.
parent 26fe60f9
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
}, },
"test-database-amount": { "test-database-amount": {
"description": "The number of test databases to create, adding auto-generated entries to database-list", "description": "The number of test databases to create, adding auto-generated entries to database-list",
"default": 0, "default": 30,
"minimum": 0, "minimum": 0,
"type": "integer" "type": "integer"
}, },
......
...@@ -181,7 +181,7 @@ context = ...@@ -181,7 +181,7 @@ context =
[template-mariadb] [template-mariadb]
< = download-base < = download-base
filename = instance-mariadb.cfg.in filename = instance-mariadb.cfg.in
md5sum = e83edd4375d4cc22387ad30e5012cbb4 md5sum = 4d88686ec012f3eb068b9777e08e55ba
link-binary = link-binary =
${coreutils:location}/bin/basename ${coreutils:location}/bin/basename
${coreutils:location}/bin/cat ${coreutils:location}/bin/cat
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
{% set use_ipv6 = slapparameter_dict.get('use-ipv6', False) -%} {% set use_ipv6 = slapparameter_dict.get('use-ipv6', False) -%}
{% set database_list = slapparameter_dict.get('database-list', [{'name': 'erp5', 'user': 'user', 'password': 'insecure'}]) -%} {% set database_list = slapparameter_dict.get('database-list', [{'name': 'erp5', 'user': 'user', 'password': 'insecure'}]) -%}
{% set test_database_list = [] %} {% set test_database_list = [] %}
{% for database_count in range(slapparameter_dict.get('test-database-amount', 0)) -%} {% for database_count in range(slapparameter_dict.get('test-database-amount', 30)) -%}
{% do test_database_list.append({'name': 'erp5_test_' ~ database_count, 'user': 'testuser_' ~ database_count, 'password': 'testpassword' ~ database_count}) -%} {% do test_database_list.append({'name': 'erp5_test_' ~ database_count, 'user': 'testuser_' ~ database_count, 'password': 'testpassword' ~ database_count}) -%}
{% endfor -%} {% endfor -%}
{% set catalog_backup = slapparameter_dict.get('catalog-backup', {}) -%} {% set catalog_backup = slapparameter_dict.get('catalog-backup', {}) -%}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment