Use factored section from slapos.cfg stack

software/agent/instance-agent.cfg

@@ -6,8 +6,18 @@ eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc
+run = $${:etc}/run
+agentlog = $${buildout:directory}/var/log/agent
+srv = $${buildout:directory}/srv
+bin = $${buildout:directory}/bin
+
+
 [instance]
-recipe = ${instance-recipe:egg}:${instance-recipe:module}
+recipe = slapos.cookbook:agent
 agent_binary = ${buildout:directory}/bin/agent
 pidfile = $${directory:srv}/agent.pid
 log = $${directory:agentlog}/agent.log
@@ -21,11 +31,3 @@ default_max_install_duration =  $${slap-parameter:default_max_install_duration}
 default_max_uninstall_duration = $${slap-parameter:default_max_uninstall_duration}
 default_max_request_duration = $${slap-parameter:default_max_request_duration}
 default_max_destroy_duration = $${slap-parameter:default_max_destroy_duration}
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
-run = $${:etc}/run
-agentlog = $${buildout:directory}/var/log/agent
-srv = $${buildout:directory}/srv
-bin = $${buildout:directory}/bin

software/agent/software.cfg

@@ -12,7 +12,7 @@ parts =
   template-agent
   slapos.cookbook-repository
   check-recipe
-  instance-recipe-egg
+  slapos-cookbook
   script
 
 # Local development
@@ -30,18 +30,6 @@ stop-on-error = true
 update-command = ${:command}
 command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
 
-[instance-recipe]
-# XXX-Cedric: it can use newest slapos.cfg to not have duplication
-egg = slapos.cookbook
-module = agent
-
-[instance-recipe-egg]
-# XXX-Cedric: it can use newest slapos.cfg to not have duplication
-recipe = zc.recipe.egg
-eggs =
-  ${lxml-python:egg}
-  ${instance-recipe:egg}
-
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
@@ -53,7 +41,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-agent.cfg
 output = ${buildout:directory}/template-agent.cfg
-md5sum = fd9670d8473be402b10990398b553b00
+md5sum = 7c5c43eb98d5a11961d72fce97a8e67b
 mode = 0644
 
 [script]