Separate egg from used module.

As slapos.cookbook provides different modules it is required to correctly
select when egg is wanted and when its module selected.

software/erp5/instance.cfg

@@ -6,7 +6,7 @@ eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 
 [instance]
-recipe = ${instance-recipe:name}
+recipe = ${instance-recipe:egg}:${instance-recipe:module}
 dcrond_binary = ${dcron:location}/sbin/crond
 haproxy_binary = ${haproxy:location}/sbin/haproxy
 httpd_binary = ${apache:location}/bin/httpd

software/erp5/software.cfg

@@ -27,7 +27,8 @@ unzip = true
 [instance-recipe]
 # Note: In case if specific instantiation recipe is used this is the place to
 # put its name
-name = slapos.cookbook:erp5
+egg = slapos.cookbook
+module = erp5
 
 [template]
 # Default template for erp5 instance.

stack/erp5.cfg

@@ -251,7 +251,7 @@ recipe = zc.recipe.egg
 python = python2.6
 eggs =
 # instantiation egg
-  ${instance-recipe:name}
+  ${instance-recipe:egg}
   erp5.conflictresolver
 
 [eggs]