Commit d08c4d85 authored by Łukasz Nowak's avatar Łukasz Nowak

Pass requested partitions' connection parameters.

parent 1f2127ae
...@@ -52,8 +52,13 @@ software-type = kumofs ...@@ -52,8 +52,13 @@ software-type = kumofs
[request-tidstorage] [request-tidstorage]
<=request-common <=request-common
name = TidStorage name = TidStorage
config = json return = url-login
config = json mysql-url memcached-url cloudooo-url kumofs-url
config-json = $${slap-parameter:json} 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 software-type = tidstorage
# rest of parts are candidates for some generic stuff # rest of parts are candidates for some generic stuff
......
...@@ -15,7 +15,7 @@ offline = true ...@@ -15,7 +15,7 @@ offline = true
[publish-mariadb-url] [publish-mariadb-url]
recipe = slapos.cookbook:publishurl 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-entry-mariadb-backup]
<= cron <= cron
......
...@@ -23,7 +23,7 @@ unzip = true ...@@ -23,7 +23,7 @@ unzip = true
[template-mariadb] [template-mariadb]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-mariadb.cfg url = ${:_profile_base_location_}/instance-mariadb.cfg
md5sum = b60b1be31d6173abd1e7546544164362 md5sum = f6e5fb6334fa6e4dbb4da3103837f8b0
output = ${buildout:directory}/template-mariadb.cfg output = ${buildout:directory}/template-mariadb.cfg
mode = 0644 mode = 0644
...@@ -74,7 +74,7 @@ mode = 0644 ...@@ -74,7 +74,7 @@ mode = 0644
[template-erp5-production] [template-erp5-production]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-erp5-production.cfg url = ${:_profile_base_location_}/instance-erp5-production.cfg
md5sum = 1c7a514854edab9cf92c28f2951147d5 md5sum = 363f08ba40344e2704f7f474364f42d8
output = ${buildout:directory}/template-erp5-production.cfg output = ${buildout:directory}/template-erp5-production.cfg
mode = 0644 mode = 0644
......
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