NEO: fix instanciation issues

- switch-softwaretype recipe is not merged to master yet so we must
  slapos-cookbook in develop mode, like for ERP5.
- Recognize "RootSoftwareInstance" as default software type for compatibility.

software/neoppod/instance.cfg.in

@@ -52,5 +52,7 @@ extra-context =
 recipe = slapos.cookbook:switch-softwaretype
 override = {{ dumps(override_switch_softwaretype |default) }}
 default = neo-cluster:rendered
+# BBB
+RootSoftwareInstance = ${:default}
 {{ admin_software_type }} = neo-admin:rendered
 {{ mysql_storage_software_type }} = neo-storage-mysql:rendered

software/neoppod/software.cfg

@@ -17,6 +17,7 @@ extends =
 
 parts =
     slapos-deps-eggs
+    slapos-cookbook-develop
     slapos-cookbook
 # NEO & dependencies
     python2.7
@@ -26,6 +27,9 @@ parts =
 # NEO instanciation
     template
 
+[slapos.cookbook-repository]
+branch = erp5-cluster
+
 [slapos-deps-eggs]
 recipe = zc.recipe.egg
 eggs =
@@ -59,7 +63,7 @@ md5sum = 38b4eb7225f9b7c18875b4d2ab398278
 [template]
 recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = fadc905aa50375e89cd3871741ad3507
+md5sum = 9eb934d9fc06b253799c661f5dfba179
 # XXX: "template.cfg" is hardcoded in instanciation recipe
 rendered = ${buildout:directory}/template.cfg
 context =