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
Jean-Paul Smets
slapos
Commits
5e5300ee
Commit
5e5300ee
authored
Jul 11, 2013
by
Benjamin Blanc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixup! Add instance ~propagation from root to others
parent
316ba4a1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
6 deletions
+22
-6
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+3
-3
stack/erp5/instance-erp5-cluster.cfg.in
stack/erp5/instance-erp5-cluster.cfg.in
+10
-1
stack/erp5/instance-scalability.cfg.in
stack/erp5/instance-scalability.cfg.in
+9
-1
stack/erp5/instance.cfg.in
stack/erp5/instance.cfg.in
+0
-1
No files found.
stack/erp5/buildout.cfg
View file @
5e5300ee
...
...
@@ -250,7 +250,7 @@ md5sum = 564006953b7d7a12d40a14b6648b32f0
# XXX: "template.cfg" is hardcoded in instanciation recipe
filename = template.cfg
template = ${:_profile_base_location_}/instance.cfg.in
md5sum =
e10f264ef99912f55b87344595928ee1
md5sum =
16fc8b6907dcff36e2c47f11a0f2cd46
extra-context =
key apache_location apache:location
key aspell_location aspell:location
...
...
@@ -324,12 +324,12 @@ md5sum = 77ec4f095a22b5bd7dfea9dff63bade5
[template-erp5-cluster]
< = download-base
filename = instance-erp5-cluster.cfg.in
md5sum =
0b401bb15c1b2b6e346fe667e082b1bc
md5sum =
19f6f1309bbefa651300a1802cab3fa0
[template-scalability]
< = download-base
filename = instance-scalability.cfg.in
md5sum =
3395d97450b0e92b0682acef39ca531c
md5sum =
49c0715ed06ab57ce84d45a7d516ef98
[template-zeo]
< = download-base
...
...
stack/erp5/instance-erp5-cluster.cfg.in
View file @
5e5300ee
...
...
@@ -3,6 +3,15 @@
{% set frontend_dict = slapparameter_dict.get('frontend', {}) %}
{% set has_frontend = frontend_dict.get('software-url', '') != '' -%}
{% set site_id = slapparameter_dict.get('site-id', 'erp5') -%}
[slap-configuration]
recipe = slapos.cookbook:slapconfiguration.serialised
computer = ${slap-connection:computer-id}
partition = ${slap-connection:partition-id}
url = ${slap-connection:server-url}
key = ${slap-connection:key-file}
cert = ${slap-connection:cert-file}
[request-common]
recipe = slapos.cookbook:request.serialised
software-url = ${slap-connection:software-release-url}
...
...
@@ -17,7 +26,7 @@ config =
${:extra-config}
extra-config =
config-use-ipv6 = {{ dumps(slapparameter_dict.get('use-ipv6', False)) }}
state =
{{ root_instance_state }
}
state =
${slap-configuration:instance-state
}
{% macro request(name, software_type, config_key, config={}, ret={'url': True}) -%}
{% do config.update(slapparameter_dict.get(config_key, {})) -%}
...
...
stack/erp5/instance-scalability.cfg.in
View file @
5e5300ee
...
...
@@ -17,6 +17,14 @@ eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
offline = true
[slap-configuration]
recipe = slapos.cookbook:slapconfiguration.serialised
computer = ${slap-connection:computer-id}
partition = ${slap-connection:partition-id}
url = ${slap-connection:server-url}
key = ${slap-connection:key-file}
cert = ${slap-connection:cert-file}
# Request erp5-cluster instance
[erp5-cluster]
recipe = slapos.cookbook:request.serialised
...
...
@@ -40,7 +48,7 @@ config = {{ cluster_parameter_dict.keys() | join(' ') }}
config-{{ key }} = {{ dumps(value) }}
{% endfor -%}
return = mariadb-url family-scalability family-user memcached-persistent-url memcached-volatile-url cloudooo-url
state =
{{ root_instance_state }
}
state =
${slap-configuration:instance-state
}
# Create wrapper
[binary-wrap-launcher]
...
...
stack/erp5/instance.cfg.in
View file @
5e5300ee
...
...
@@ -26,7 +26,6 @@ context =
key slap_software_type slap-configuration:slap-software-type
key slapparameter_dict slap-configuration:configuration
key computer_id slap-configuration:computer
key root_instance_state slap-configuration:instance-state
${:extra-context}
[dynamic-template-cloudooo-parameters]
...
...
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