Commit 76375f31 authored by Vincent Pelletier's avatar Vincent Pelletier

erp5-cluster: Fix mariadb url for automated ERP5 site creation.

parent 4160aa3a
......@@ -230,7 +230,7 @@ md5sum = 2ce65ad372433ae8e11e30f3191bca68
[template-create-erp5-site-real]
< = download-base
filename = instance-create-erp5-site-real.cfg.in
md5sum = e106cdd73c0a86a9b2c806062573ca8f
md5sum = e40e2e39f4941c6372f4357e8589a5cf
[template]
< = template-jinja2-base
......
......@@ -14,7 +14,7 @@ runner-path = ${directory:services}/erp5-bootstrap
{% endfor -%}
{# XXX: Expect the first database to be the one to use for catalog. -#}
{% set mysql_parsed = urlparse.urlparse(publish['mariadb-database-list'][0]) -%}
mysql-url = {{ urlparse.urlunparse(mysql_parsed[:1] + (reverse_hosts.get(mysql_parsed.hostname, mysql_parsed.hostname) ~ ':' ~ mysql_parsed.port, ) + mysql_parsed[2:]) }}
mysql-url = {{ dumps(urlparse.urlunparse(mysql_parsed[:1] + (mysql_parsed.username + ":" + mysql_parsed.password + "@" + reverse_hosts.get(mysql_parsed.hostname, mysql_parsed.hostname) + ':' ~ mysql_parsed.port, ) + mysql_parsed[2:])) }}
{# Pick the first http[s] family found, they should be all equivalent anyway. -#}
{% set family_list = [] -%}
{% for key, value in publish.items() -%}
......
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