Commit 56728231 authored by Vincent Pelletier's avatar Vincent Pelletier

Revert "Use IPv6 to access mariadb."

This reverts commit fdb2b87b.
This breaks erp5 test runner (maybe it does not accept IPv6 in SQL
connection strings).
parent fdb2b87b
...@@ -184,7 +184,7 @@ context = ...@@ -184,7 +184,7 @@ context =
[template-mariadb] [template-mariadb]
< = template-jinja2-base < = template-jinja2-base
filename = instance-mariadb.cfg filename = instance-mariadb.cfg
md5sum = 78fa0d9e9f98875093b6d9929d6f2ccf md5sum = 867bd8e3c4f56db2aab2fcad59f2efd8
extra-context = extra-context =
key coreutils_location coreutils:location key coreutils_location coreutils:location
key dcron_location dcron:location key dcron_location dcron:location
......
...@@ -16,7 +16,7 @@ offline = true ...@@ -16,7 +16,7 @@ offline = true
[publish-mariadb-url] [publish-mariadb-url]
recipe = slapos.cookbook:publishurl recipe = slapos.cookbook:publishurl
url = mysql://${mariadb-instance:user}:${mariadb-instance:password}@[${mariadb-instance:ip}]:${mariadb-instance:port}/${mariadb-instance:database} url = mysql://${mariadb-instance:user}:${mariadb-instance:password}@${mariadb-instance:ip}:${mariadb-instance:port}/${mariadb-instance:database}
[cron-entry-mariadb-backup] [cron-entry-mariadb-backup]
<= cron <= cron
...@@ -32,7 +32,7 @@ recipe = slapos.cookbook:generic.mysql ...@@ -32,7 +32,7 @@ recipe = slapos.cookbook:generic.mysql
user = user user = user
parallel-test-database-amount = ${slap-parameter:test-database-amount} parallel-test-database-amount = ${slap-parameter:test-database-amount}
port = 45678 port = 45678
ip = ${slap-network-information:global-ipv6} ip = ${slap-network-information:local-ipv4}
database = erp5 database = erp5
test-user = erp5_test test-user = erp5_test
test-database = erp5_test test-database = erp5_test
......
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