Commit fbdf702f authored by Vincent Pelletier's avatar Vincent Pelletier

Triage more non-parameter values retrieved from master.

Generalises slap_software_type handling.
parent 92aebd7e
...@@ -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()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment