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

Do not request tidstorage.

parent 8804f532
...@@ -11,7 +11,6 @@ parts = ...@@ -11,7 +11,6 @@ parts =
request-cloudooo request-cloudooo
request-memcached request-memcached
request-kumofs request-kumofs
request-tidstorage
basedirectory basedirectory
certificate-authority certificate-authority
publish-apache-zope-backend-connection-string publish-apache-zope-backend-connection-string
...@@ -27,6 +26,14 @@ eggs-directory = ${buildout:eggs-directory} ...@@ -27,6 +26,14 @@ eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory} develop-eggs-directory = ${buildout:develop-eggs-directory}
offline = true offline = true
# support those parameters
#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}
[request-common] [request-common]
recipe = slapos.cookbook:request recipe = slapos.cookbook:request
software-url = $${slap-connection:software-release-url} software-url = $${slap-connection:software-release-url}
...@@ -59,18 +66,6 @@ software-type = memcached ...@@ -59,18 +66,6 @@ software-type = memcached
name = KumoFS name = KumoFS
software-type = kumofs software-type = kumofs
[request-tidstorage]
<=request-common
name = TidStorage
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 # rest of parts are candidates for some generic stuff
[basedirectory] [basedirectory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
......
...@@ -60,7 +60,7 @@ mode = 0644 ...@@ -60,7 +60,7 @@ mode = 0644
[template-erp5-development] [template-erp5-development]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-erp5-development.cfg url = ${:_profile_base_location_}/instance-erp5-development.cfg
md5sum = fbbc3d6283164c3500c620dd56ab7bab md5sum = a393e0b5ad3623b280e159006a60f19f
output = ${buildout:directory}/template-erp5-development.cfg output = ${buildout:directory}/template-erp5-development.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