From 9dca3d9345a1dd1983fb8248188b164eb43bb131 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com>
Date: Fri, 14 Dec 2012 10:29:06 +0100
Subject: [PATCH] Use factored section from slapos.cfg stack
---
software/agent/instance-agent.cfg | 20 +++++++++++---------
software/agent/software.cfg | 16 ++--------------
2 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/software/agent/instance-agent.cfg b/software/agent/instance-agent.cfg
index 90b9ec777..1e49f513f 100644
--- a/software/agent/instance-agent.cfg
+++ b/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
diff --git a/software/agent/software.cfg b/software/agent/software.cfg
index 1695b9038..6652798de 100644
--- a/software/agent/software.cfg
+++ b/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]
--
2.30.9