Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Iliya Manolov
slapos
Commits
d675b8f6
Commit
d675b8f6
authored
Jan 12, 2012
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow to select computer of erp5 component.
By default, all components are located on the same computer.
parent
88345654
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
2 deletions
+16
-2
software/erp5/instance-erp5-production.cfg
software/erp5/instance-erp5-production.cfg
+15
-1
software/erp5/software.cfg
software/erp5/software.cfg
+1
-1
No files found.
software/erp5/instance-erp5-production.cfg
View file @
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]
...
...
software/erp5/software.cfg
View file @
d675b8f6
...
@@ -108,7 +108,7 @@ mode = 0644
...
@@ -108,7 +108,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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment