repman: generate slave database password if not set

software/repman/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = 9aeb37bd4590aa7fa746ef70d78cc0d0
 
 [instance-repman.cfg]
 _update_hash_filename_ = instance-repman.cfg.jinja2.in
-md5sum = 2861fc893f21797e71c4f0e46c2383a1
+md5sum = b246b466e28afc6208969fdd5a7e22f3
 
 [config-toml.in]
 _update_hash_filename_ = templates/config.toml.in
@@ -34,7 +34,7 @@ md5sum = 0eeb24c6aa0760f0d33c4cc2828ddf30
 
 [template-mariadb.cfg]
 _update_hash_filename_ = instance-mariadb.cfg.jinja2.in
-md5sum = 52c3429d63d15d56daef062262f171db
+md5sum = f1a03197b3a208cf6167769157e2df47
 
 [template-my-cnf]
 _update_hash_filename_ = templates/my.cnf.in
@@ -46,7 +46,7 @@ md5sum = 96c151c376600a90fe2a44825f2de550
 
 [template-publish-slave-information]
 _update_hash_filename_ = publish-database-slave-parameters.cfg.in
-md5sum = ea35caa846702c71cd353e81c766befb
+md5sum = 9616477ff993c55c2b43bf8797db6994
 
 [mariadb-init-root-sql]
 _update_hash_filename_ = templates/mariadb_init_root.sql.in

software/repman/instance-mariadb.cfg.jinja2.in

@@ -17,18 +17,11 @@
 
 [{{ section('publish') }}]
 recipe = slapos.cookbook:publish.serialised
--extends = publish-early
 database-host = {{ host }}:{{ port }}
 monitor-base-url = ${monitor-publish-parameters:monitor-base-url}
 partition-path = ${buildout:directory}
 receiver-port = ${dbjob-parameter:socat-port}
 
-[publish-early]
-recipe = slapos.cookbook:publish-early
--init =
-
-database-list = {{ dumps(database_list) }}
-
 [jinja2-template-base]
 recipe = slapos.recipe.template:jinja2
 mode = 644

software/repman/instance-repman-slave-input-schema.json

 {
   "$schema": "http://json-schema.org/draft-04/schema",
   "properties": {
-    "db_name": {
-      "description": "Database Name. If empty, name is autogenerated from slave reference.",
-      "title": "Database Name",
-      "type": "string",
-      "default": ""
-    },
     "db_user": {
-      "description": "Database User",
+      "description": "Database User, default is 'user'. This parameter is set only if database is not created yet.",
       "title": "Database User",
       "type": "string",
       "default": "user"
     },
     "db_password": {
-      "description": "Database Password. If no password set, a password will be generated",
-      "title": "Database Password",
+      "description": "Database password. If no password set, a password will be generated. This parameter is set only if database is not created yet.",
+      "title": "Initial database password",
       "type": "string",
       "default": ""
     },
     "db_charset": {
-      "description": "Database Character set information.",
+      "description": "Database Character set information. This parameter is set only if database is not created yet.",
       "title": "Database Character set information",
       "type": "string",
       "enum": [

software/repman/instance-repman.cfg.jinja2.in

@@ -10,9 +10,16 @@
 {% set cluster_list = [] -%}
 {% set tag_list = ["gtidstrict", "bind", "pkg", "innodb", "noquerycache", "slow", "pfs", "linux", "readonly", "diskmonitor", "sqlerror", "compressbinlog", "bm4ci", "mroonga", "utctime", "readcommitted", "nohandshake"] -%}
 {% set frontend_parameter_dict = slapparameter_dict.get('slave-frontend', {}) -%}
-{% set dabase_slave_list = [] -%}
+{% set database_slave_list = [] -%}
 {% set db_name_list = [] -%}
 
+{% macro password(name) -%}
+[{{ name }}-password]
+recipe = slapos.cookbook:generate.password
+bytes = 12
+
+{% endmacro -%}
+
 [directory]
 recipe = slapos.cookbook:mkdirectory
 home = ${buildout:directory}
@@ -60,18 +67,21 @@ template = inline:#!{{ bash_bin }}
 rendered = ${directory:bin}/update-proxysql-config
 mode = 755
 
-[database-slave-information]
 {% for instance_dict in slave_instance_list -%}
 {% set slave_dict = {
   'name': 'db_%s' % instance_dict['slave_reference'].replace('-', '_').lower(),
   'user': instance_dict.get('db_user', 'user'),
-  'password': instance_dict.get('db_password'),
+  'password': instance_dict.get('db_password', '${' ~ instance_dict['slave_reference'] ~ '-password:passwd}'),
   'slave_reference': instance_dict['slave_reference'],
   'charset': instance_dict.get('db_charset', '')
   } -%}
-{{ slave_dict['name'] }} = {{ dumps(slave_dict) }}
-{% do dabase_slave_list.append(slave_dict) -%}
+{% do database_slave_list.append(slave_dict) -%}
 {% do db_name_list.append(slave_dict['name']) -%}
+{{ password(instance_dict['slave_reference']) }}
+{% endfor %}
+[database-slave-information]
+{% for slave_dict in database_slave_list -%}
+{{ slave_dict['name'] }} = !py!{{ slave_dict }}
 {% endfor %}
 {% set db_list = db_name_list | join(' ') -%}
 
@@ -93,7 +103,7 @@ mode = 755
 {% for i in range(0, db_amount) -%}
 {% do mariadb_dict.__setitem__('tcp-port', 2099 + (i * 100)) -%}
 {% set section = 'request-mariadb-' ~ i -%}
-{% set dbname = 'Mariadb-' ~ i -%}
+{% set dbname = 'Mariadb-' ~ i %}
 
 
 [{{ section }}]
@@ -113,7 +123,7 @@ config-repman-url = ${nginx-parameter:backend-url}
 config-repman-secure-url = ${nginx-parameter:backend-ssl-url}
 config-cluster = {{ name }}
 config-name = {{ dbname }}
-config-database-list = {{ dumps(dabase_slave_list) }}
+config-database-list = !py!{{ database_slave_list }}
 config-database-name = {{ dumps(db_list) }}
 return = 
   database-host

software/repman/publish-database-slave-parameters.cfg.in

@@ -32,6 +32,6 @@ develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
 parts =
-{% for part in part_list %}
+{% for part in part_list -%}
 {{ '  %s' % part }}
-{% endfor %}
+{% endfor -%}