From d08c4d85e80da5d9a2135c1c538724f4fa399e29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com>
Date: Wed, 19 Oct 2011 18:05:07 +0200
Subject: [PATCH] Pass requested partitions' connection parameters.
---
software/erp5/instance-erp5-production.cfg | 7 ++++++-
software/erp5/instance-mariadb.cfg | 2 +-
software/erp5/software.cfg | 4 ++--
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/software/erp5/instance-erp5-production.cfg b/software/erp5/instance-erp5-production.cfg
index 832578b65..426097833 100644
--- a/software/erp5/instance-erp5-production.cfg
+++ b/software/erp5/instance-erp5-production.cfg
@@ -52,8 +52,13 @@ software-type = kumofs
[request-tidstorage]
<=request-common
name = TidStorage
-config = json
+return = url-login
+config = json mysql-url memcached-url cloudooo-url kumofs-url
config-json = $${slap-parameter:json}
+config-mysql-url = $${request-mariadb:connection-url}
+config-memcached-url = $${request-memcached:connection-url}
+config-cloudooo-url = $${request-cloudooo:connection-url}
+config-kumofs-url = $${request-kumofs:connection-url}
software-type = tidstorage
# rest of parts are candidates for some generic stuff
diff --git a/software/erp5/instance-mariadb.cfg b/software/erp5/instance-mariadb.cfg
index 9ee4736a8..4e2261225 100644
--- a/software/erp5/instance-mariadb.cfg
+++ b/software/erp5/instance-mariadb.cfg
@@ -15,7 +15,7 @@ offline = true
[publish-mariadb-url]
recipe = slapos.cookbook:publishurl
-url = mysqls://$${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
diff --git a/software/erp5/software.cfg b/software/erp5/software.cfg
index 382239a09..28721d41c 100644
--- a/software/erp5/software.cfg
+++ b/software/erp5/software.cfg
@@ -23,7 +23,7 @@ unzip = true
[template-mariadb]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-mariadb.cfg
-md5sum = b60b1be31d6173abd1e7546544164362
+md5sum = f6e5fb6334fa6e4dbb4da3103837f8b0
output = ${buildout:directory}/template-mariadb.cfg
mode = 0644
@@ -74,7 +74,7 @@ mode = 0644
[template-erp5-production]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-erp5-production.cfg
-md5sum = 1c7a514854edab9cf92c28f2951147d5
+md5sum = 363f08ba40344e2704f7f474364f42d8
output = ${buildout:directory}/template-erp5-production.cfg
mode = 0644
--
2.30.9