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
Matevz Golob
slapos
Commits
63753e34
Commit
63753e34
authored
Jul 15, 2013
by
Benjamin Blanc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
scalability: add erp5_location (dev) key
parent
da45fd0d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
2 deletions
+9
-2
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+3
-2
stack/erp5/instance-scalability.cfg.in
stack/erp5/instance-scalability.cfg.in
+1
-0
stack/erp5/instance.cfg.in
stack/erp5/instance.cfg.in
+5
-0
No files found.
stack/erp5/buildout.cfg
View file @
63753e34
...
@@ -250,7 +250,7 @@ md5sum = 564006953b7d7a12d40a14b6648b32f0
...
@@ -250,7 +250,7 @@ md5sum = 564006953b7d7a12d40a14b6648b32f0
# XXX: "template.cfg" is hardcoded in instanciation recipe
# XXX: "template.cfg" is hardcoded in instanciation recipe
filename = template.cfg
filename = template.cfg
template = ${:_profile_base_location_}/instance.cfg.in
template = ${:_profile_base_location_}/instance.cfg.in
md5sum = 1
6fc8b6907dcff36e2c47f11a0f2cd46
md5sum = 1
4fa86c4b817f0286d629c6aef4a00e5
extra-context =
extra-context =
key apache_location apache:location
key apache_location apache:location
key aspell_location aspell:location
key aspell_location aspell:location
...
@@ -261,6 +261,7 @@ extra-context =
...
@@ -261,6 +261,7 @@ extra-context =
key dcron_location dcron:location
key dcron_location dcron:location
key dmtx_utils_location dmtx-utils:location
key dmtx_utils_location dmtx-utils:location
key erp5_location erp5:location
key erp5_location erp5:location
key erp5_dev_location erp5.dev-repository:location
key file_location file:location
key file_location file:location
key findutils_location findutils:location
key findutils_location findutils:location
key fontconfig_location fontconfig:location
key fontconfig_location fontconfig:location
...
@@ -329,7 +330,7 @@ md5sum = 19f6f1309bbefa651300a1802cab3fa0
...
@@ -329,7 +330,7 @@ md5sum = 19f6f1309bbefa651300a1802cab3fa0
[template-scalability]
[template-scalability]
< = download-base
< = download-base
filename = instance-scalability.cfg.in
filename = instance-scalability.cfg.in
md5sum =
49c0715ed06ab57ce84d45a7d516ef98
md5sum =
3f0fc18117937f54739e2bff90e90a25
[template-zeo]
[template-zeo]
< = download-base
< = download-base
...
...
stack/erp5/instance-scalability.cfg.in
View file @
63753e34
...
@@ -56,6 +56,7 @@ recipe = slapos.cookbook:wrapper
...
@@ -56,6 +56,7 @@ recipe = slapos.cookbook:wrapper
log-path = ${basedirectory:log}
log-path = ${basedirectory:log}
binary-path = {{ bin_directory }}/runScalabilityTestSuite
binary-path = {{ bin_directory }}/runScalabilityTestSuite
wrapper-path = ${rootdirectory:bin}/runScalabilityTestSuite
wrapper-path = ${rootdirectory:bin}/runScalabilityTestSuite
erp5-location = {{ erp5_location }}
output = ${binary-wrap-launcher:binary-path}
output = ${binary-wrap-launcher:binary-path}
site-id = "/{{ site_id }}"
site-id = "/{{ site_id }}"
# Suppose that there is a user zope family in the configuration
# Suppose that there is a user zope family in the configuration
...
...
stack/erp5/instance.cfg.in
View file @
63753e34
...
@@ -163,12 +163,17 @@ extra-context =
...
@@ -163,12 +163,17 @@ extra-context =
# Must match the key id in [switch-softwaretype] which uses this section.
# Must match the key id in [switch-softwaretype] which uses this section.
raw software_type cluster
raw software_type cluster
[dynamic-template-scalability-parameters]
erp5 = {{ erp5_location }}
erp5_dev = {{ erp5_dev_location }}
[dynamic-template-scalability]
[dynamic-template-scalability]
< = jinja2-template-base
< = jinja2-template-base
template = {{ template_scalability }}
template = {{ template_scalability }}
filename = instance-scalability.cfg
filename = instance-scalability.cfg
extensions = jinja2.ext.do
extensions = jinja2.ext.do
extra-context =
extra-context =
key erp5_location ${dynamic-template-scalability-parameters:erp5_dev}
key local_bt5_repository dynamic-template-cluster-erp5-parameters:local-bt5-repository
key local_bt5_repository dynamic-template-cluster-erp5-parameters:local-bt5-repository
# Must match the key id in [switch-softwaretype] which uses this section.
# Must match the key id in [switch-softwaretype] which uses this section.
raw software_type scalability
raw software_type scalability
...
...
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