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
Leo Le Bouter
slapos
Commits
fad66997
Commit
fad66997
authored
Sep 24, 2012
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add support for non-string storage definition.
In preparation for better ERP5 clusterisation.
parent
020bb119
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
11 deletions
+17
-11
slapos/recipe/zeo/__init__.py
slapos/recipe/zeo/__init__.py
+17
-11
No files found.
slapos/recipe/zeo/__init__.py
View file @
fad66997
...
...
@@ -56,17 +56,23 @@ class Recipe(GenericBaseRecipe):
'zeo-filestorage-snippet.conf.in'
)
# Prepare all filestorages
filestorage_snippet
=
""
for
storage_definition
in
self
.
options
[
'storage'
].
splitlines
():
storage_definition
=
storage_definition
.
strip
()
if
not
storage_definition
:
continue
for
q
in
storage_definition
.
split
():
if
'storage-name'
in
q
:
storage_name
=
q
.
split
(
'='
)[
1
].
strip
()
if
'zodb-path'
in
q
:
zodb_path
=
q
.
split
(
'='
)[
1
].
strip
()
filestorage_snippet
+=
self
.
substituteTemplate
(
snippet_filename
,
dict
(
storage_name
=
storage_name
,
path
=
zodb_path
))
storage
=
self
.
options
[
'storage'
]
if
isinstance
(
storage
,
basestring
):
for
storage_definition
in
storage
.
splitlines
():
storage_definition
=
storage_definition
.
strip
()
if
not
storage_definition
:
continue
for
q
in
storage_definition
.
split
():
if
'storage-name'
in
q
:
storage_name
=
q
.
split
(
'='
)[
1
].
strip
()
if
'zodb-path'
in
q
:
zodb_path
=
q
.
split
(
'='
)[
1
].
strip
()
filestorage_snippet
+=
self
.
substituteTemplate
(
snippet_filename
,
dict
(
storage_name
=
storage_name
,
path
=
zodb_path
))
else
:
for
storage_name
,
path
in
storage
:
filestorage_snippet
+=
self
.
substituteTemplate
(
snippet_filename
,
{
'storage_name'
:
storage_name
,
'path'
:
path
})
config
=
dict
(
zeo_ip
=
self
.
options
[
'ip'
],
...
...
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