Expose software type separately from partition parameters.

Also, hide ip_list for the same reason: it's a partition property, not a
partition parameter. It is not handled yet (not needed).
Also, rework documentation a bit.

slapos/recipe/slapconfiguration.py

@@ -65,14 +65,18 @@ class Recipe(object):
       integer value to enable them.
 
   Output:
-    One key per supported serialisation format, with all partition parameters
-    serialised in that format as values and format's name.
-    Also, one key per partition parameter, prefixed with serialisation format
-    followed by a dot. Example:
+    slap-software-type.<format>
+      Current partition's software type, serialised in each available format.
+    <format>
+      All partition parameters serialised in that format as values.
+      Example:
         json = {"foo": "bar"}
+    <format>.key
+      One key per partition parameter, prefixed with serialisation format
+      followed by a dot. Example:
         json.foo = "bar"
 
-  Supported serailisation formats:
+  Supported serialisation formats:
     json (safe)
       JavaScript Object Notation
     str (unsafe)
@@ -94,11 +98,16 @@ class Recipe(object):
           options['computer'],
           options['partition'],
       ).getInstanceParameterDict()
+      # XXX: those are not partition parameters, strictly speaking.
+      # Discard them, and make them available as separate section keys.
+      slap_software_type = parameter_dict.pop('slap_software_type')
+      del parameter_dict['ip_list']
       allow_unsafe = bool(int(options.get('unsafe', '0')))
       match = self.OPTCRE.match
       for name, (safe, cast) in cast_dict.iteritems():
           if not safe and not allow_unsafe:
               continue
+          options['slap-software-type.' + name] = cast(slap_software_type)
           options[name] = cast(parameter_dict)
           for key, value in parameter_dict.iteritems():
               if match(key) is not None:

software/erp5/instance-cloudoo.cfg.in

-{% if software_type == slapparameter_dict['slap_software_type'] -%}
+{% if software_type == slap_software_type -%}
 {% set json = json_module.loads(parameter_dict.get('cloudooo-json', '{}')) -%}
 {% set bin_directory = parameter_dict['buildout-bin-directory'] -%}
 [buildout]

software/erp5/instance-tidstorage.cfg.in

-{% if software_type == slapparameter_dict['slap_software_type'] -%}
+{% if software_type == slap_software_type -%}
 {#
 Note: all port counters are pre-incremented. No idea why base port is skipped.
 -#}

software/erp5/instance.cfg.in

@@ -21,6 +21,7 @@ extra-context =
 context =
     key eggs_directory buildout:eggs-directory
     key develop_eggs_directory buildout:develop-eggs-directory
+    jsonkey slap_software_type slap-parameters:slap-software-type.json
     jsonkey slapparameter_dict slap-parameters:json
     ${:extra-context}
 

software/erp5/software.cfg

@@ -132,13 +132,13 @@ extra-context =
 [template-tidstorage]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-tidstorage.cfg.in
-md5sum = 34e7ba946640e5aec08d72634b25128f
+md5sum = eeea27e691d80c1dd605ad99cfbba3c3
 mode = 640
 
 [template-cloudooo]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-cloudoo.cfg.in
-md5sum = aea927d5d3363177fd1017c4b89838d7
+md5sum = d3b3afac9099823ba2853070324a29c8
 mode = 640
 
 # Additional Configuration
@@ -149,7 +149,7 @@ configurator_bt5_list = erp5_core_proxy_field_legacy erp5_full_text_myisam_catal
 # XXX: "template.cfg" is hardcoded in instanciation recipe
 filename = template.cfg
 template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = fc4c561f56387b74b45664f0f2268725
+md5sum = 0f3dcf0e156025d6b8f5f3efdd161282
 extra-context =
     key apache_location apache:location
     key aspell_location aspell:location