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
fbdf702f
Commit
fbdf702f
authored
Dec 27, 2012
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Triage more non-parameter values retrieved from master.
Generalises slap_software_type handling.
parent
92aebd7e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
3 deletions
+15
-3
slapos/recipe/slapconfiguration.py
slapos/recipe/slapconfiguration.py
+15
-3
No files found.
slapos/recipe/slapconfiguration.py
View file @
fbdf702f
...
@@ -92,9 +92,21 @@ class Recipe(object):
...
@@ -92,9 +92,21 @@ class Recipe(object):
options
[
'partition'
],
options
[
'partition'
],
).
getInstanceParameterDict
()
).
getInstanceParameterDict
()
# XXX: those are not partition parameters, strictly speaking.
# XXX: those are not partition parameters, strictly speaking.
# Discard them, and make them available as separate section keys.
# Make them available as individual section keys.
options
[
'slap-software-type'
]
=
parameter_dict
.
pop
(
for
his_key
in
(
'slap_software_type'
)
'slap_software_type'
,
'slap_computer_partition_id'
,
'slap_computer_id'
,
'slap_software_release_url'
,
'slave_instance_list'
,
'timestamp'
,
):
try
:
value
=
parameter_dict
.
pop
(
his_key
)
except
KeyError
:
pass
else
:
options
[
his_key
.
replace
(
'_'
,
'-'
)]
=
value
ipv4_set
=
set
()
ipv4_set
=
set
()
v4_add
=
ipv4_set
.
add
v4_add
=
ipv4_set
.
add
ipv6_set
=
set
()
ipv6_set
=
set
()
...
...
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