Commit 8b230272 authored by Romain Courteaud's avatar Romain Courteaud

Merge remote-tracking branch 'origin/erp5-generic' into deployment_generic_CR1094

parents 88c8167d d675b8f6
...@@ -22,7 +22,6 @@ offline = true ...@@ -22,7 +22,6 @@ offline = true
recipe = slapos.cookbook:request recipe = slapos.cookbook:request
software-url = $${slap-connection:software-release-url} software-url = $${slap-connection:software-release-url}
sla = computer_guid sla = computer_guid
sla-computer_guid = $${slap-connection:computer-id}
return = url return = url
server-url = $${slap-connection:server-url} server-url = $${slap-connection:server-url}
key-file = $${slap-connection:key-file} key-file = $${slap-connection:key-file}
...@@ -34,11 +33,13 @@ partition-id = $${slap-connection:partition-id} ...@@ -34,11 +33,13 @@ partition-id = $${slap-connection:partition-id}
<=request-common <=request-common
name = Sphinx Search Engine name = Sphinx Search Engine
software-type = sphinx software-type = sphinx
sla-computer_guid = $${slap-parameter:sphinx-computer-guid}
[request-mariadb] [request-mariadb]
<=request-common <=request-common
name = MariaDB DataBase name = MariaDB DataBase
software-type = mariadb software-type = mariadb
sla-computer_guid = $${slap-parameter:mariadb-computer-guid}
[request-cloudooo] [request-cloudooo]
<=request-common <=request-common
...@@ -46,16 +47,19 @@ name = Cloudooo ...@@ -46,16 +47,19 @@ name = Cloudooo
config = cloudooo-json config = cloudooo-json
config-cloudooo-json = $${slap-parameter:cloudooo-json} config-cloudooo-json = $${slap-parameter:cloudooo-json}
software-type = cloudooo software-type = cloudooo
sla-computer_guid = $${slap-parameter:cloudooo-computer-guid}
[request-memcached] [request-memcached]
<=request-common <=request-common
name = Memcached name = Memcached
software-type = memcached software-type = memcached
sla-computer_guid = $${slap-parameter:memcached-computer-guid}
[request-kumofs] [request-kumofs]
<=request-common <=request-common
name = KumoFS name = KumoFS
software-type = kumofs software-type = kumofs
sla-computer_guid = $${slap-parameter:kumofs-computer-guid}
[request-tidstorage] [request-tidstorage]
<=request-common <=request-common
...@@ -68,6 +72,16 @@ config-memcached-url = $${request-memcached:connection-url} ...@@ -68,6 +72,16 @@ config-memcached-url = $${request-memcached:connection-url}
config-cloudooo-url = $${request-cloudooo:connection-url} config-cloudooo-url = $${request-cloudooo:connection-url}
config-kumofs-url = $${request-kumofs:connection-url} config-kumofs-url = $${request-kumofs:connection-url}
software-type = tidstorage software-type = tidstorage
sla-computer_guid = $${slap-parameter:tidstorage-computer-guid}
[slap-parameter]
# Default value if no computer_guid is specified for each type
sphinx-computer-guid = $${slap-connection:computer-id}
mariadb-computer-guid = $${slap-connection:computer-id}
cloudooo-computer-guid = $${slap-connection:computer-id}
memcached-computer-guid = $${slap-connection:computer-id}
kumofs-computer-guid = $${slap-connection:computer-id}
tidstorage-computer-guid = $${slap-connection:computer-id}
# rest of parts are candidates for some generic stuff # rest of parts are candidates for some generic stuff
[basedirectory] [basedirectory]
......
...@@ -124,7 +124,7 @@ mode = 0644 ...@@ -124,7 +124,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 = 452bad01b27bf2a97739920a41aac7f3 md5sum = 32f6537110bbc29e7cc5613695863096
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