From facccf62437d9ea52a4645244ac9c8d477780e00 Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Tue, 1 Sep 2015 16:05:55 +0200 Subject: [PATCH] slaprunner: cleanup. --- software/slaprunner/common.cfg | 5 ++++- software/slaprunner/development.cfg | 11 +---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/software/slaprunner/common.cfg b/software/slaprunner/common.cfg index 892a55aba..8906773d6 100644 --- a/software/slaprunner/common.cfg +++ b/software/slaprunner/common.cfg @@ -26,7 +26,7 @@ extends = # stacks are listed from most generic to most specific, # to avoid versioning issues -parts = +common-parts = template eggs instance-runner-import @@ -36,6 +36,9 @@ parts = rdiff-backup collective.recipe.template-egg +parts = + ${:common-parts} + # Use shellinabox from github with AF_UNIX support [shellinabox] <= shellinabox-github diff --git a/software/slaprunner/development.cfg b/software/slaprunner/development.cfg index 2537e3bb9..ca935e409 100644 --- a/software/slaprunner/development.cfg +++ b/software/slaprunner/development.cfg @@ -11,17 +11,8 @@ parts = slapos.toolbox-dev slapos.cookbook-dev slapos.core-dev -# erp5.util-dev -# Good elements - template - eggs - instance-runner-import - instance-runner-export slapos-cookbook - template-slapos-cfg -# XXX: we have to manually add this for resilience - rdiff-backup - collective.recipe.template-egg + ${:common-parts} [slapos.toolbox-repository] recipe = slapos.recipe.build:gitclone -- 2.30.9