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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Lisa Casino
slapos
Commits
ef1359e6
Commit
ef1359e6
authored
Jun 09, 2015
by
Saurabh
Committed by
Julien Muchembled
Jun 11, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ERP5: fix 'sla-dict' instanciation parameter, and default to same computer
parent
2cc2b283
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+2
-2
stack/erp5/instance-erp5.cfg.in
stack/erp5/instance-erp5.cfg.in
+4
-2
stack/erp5/instance.cfg.in
stack/erp5/instance.cfg.in
+0
-1
No files found.
stack/erp5/buildout.cfg
View file @
ef1359e6
...
@@ -224,7 +224,7 @@ md5sum = e40e2e39f4941c6372f4357e8589a5cf
...
@@ -224,7 +224,7 @@ md5sum = e40e2e39f4941c6372f4357e8589a5cf
# 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 =
c57404cdbbce6b37554719a894f9a88d
md5sum =
29a35a63d1d94e120d9825195add31df
extra-context =
extra-context =
key mariadb_link_binary template-mariadb:link-binary
key mariadb_link_binary template-mariadb:link-binary
key zope_link_binary template-zope:link-binary
key zope_link_binary template-zope:link-binary
...
@@ -296,7 +296,7 @@ extra-context =
...
@@ -296,7 +296,7 @@ extra-context =
[template-erp5]
[template-erp5]
< = download-base
< = download-base
filename = instance-erp5.cfg.in
filename = instance-erp5.cfg.in
md5sum =
4aca7b8633c12ad6a0fe2ac569648c82
md5sum =
675c7a5cfc24153889f0803ed6eb5f7e
[template-zeo]
[template-zeo]
< = download-base
< = download-base
...
...
stack/erp5/instance-erp5.cfg.in
View file @
ef1359e6
...
@@ -20,9 +20,11 @@ config-use-ipv6 = {{ dumps(slapparameter_dict.get('use-ipv6', False)) }}
...
@@ -20,9 +20,11 @@ config-use-ipv6 = {{ dumps(slapparameter_dict.get('use-ipv6', False)) }}
{% macro sla(name, required=False) -%}
{% macro sla(name, required=False) -%}
{% if required or name in sla_dict -%}
{% if required or name in sla_dict -%}
{% for k, (v,) in urlparse.parse_qs(sla
p
_dict.pop(name), strict_parsing=1).iteritems() -%}
{% for k, (v,) in urlparse.parse_qs(sla_dict.pop(name), strict_parsing=1).iteritems() -%}
sla-{{ k }} = {{
dumps(v)
}}
sla-{{ k }} = {{
v
}}
{% endfor -%}
{% endfor -%}
{% else -%}
sla-computer_guid = ${slap-connection:computer-id}
{% endif -%}
{% endif -%}
{% endmacro -%}
{% endmacro -%}
...
...
stack/erp5/instance.cfg.in
View file @
ef1359e6
...
@@ -19,7 +19,6 @@ context =
...
@@ -19,7 +19,6 @@ context =
key ipv4_set slap-configuration:ipv4
key ipv4_set slap-configuration:ipv4
key ipv6_set slap-configuration:ipv6
key ipv6_set slap-configuration:ipv6
key slapparameter_dict slap-configuration:configuration
key slapparameter_dict slap-configuration:configuration
key computer_id slap-configuration:computer
raw slapos_core_version {{ slapos_core_version }}
raw slapos_core_version {{ slapos_core_version }}
raw logrotate_cfg {{ template_logrotate_base }}
raw logrotate_cfg {{ template_logrotate_base }}
${:extra-context}
${:extra-context}
...
...
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