From 761c9b69a426d9863f884fe030b929046d42b3e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com> Date: Fri, 23 Jan 2015 09:29:12 +0100 Subject: [PATCH] slaprunner: move supervisord option to new location. --- software/slaprunner/common.cfg | 2 +- software/slaprunner/template/slapos.cfg.in | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/software/slaprunner/common.cfg b/software/slaprunner/common.cfg index 4ed8fbf0d..a0dad7d76 100644 --- a/software/slaprunner/common.cfg +++ b/software/slaprunner/common.cfg @@ -120,7 +120,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_} [template-slapos-cfg] recipe = hexagonit.recipe.download url = ${:_profile_base_location_}/template/${:filename} -md5sum = e1af7397215fe72712d42e5d5e3120e8 +md5sum = c490563b831fc959a09b4b233263a6c6 location = ${buildout:parts-directory}/${:_buildout_section_name_} filename = slapos.cfg.in download-only = true diff --git a/software/slaprunner/template/slapos.cfg.in b/software/slaprunner/template/slapos.cfg.in index fd494e431..a2a54c27e 100644 --- a/software/slaprunner/template/slapos.cfg.in +++ b/software/slaprunner/template/slapos.cfg.in @@ -5,6 +5,7 @@ master_url = http://{{ slaprunner['ipv4'] }}:{{ slaprunner['proxy_port'] }} computer_id = slaprunner maximal_delay = 0 root_check = {{ slaprunner['root_check'] }} +forbid_supervisord_automatic_launch = true [slapformat] partition_amount = {{ slaprunner['partition-amount'] }} @@ -48,6 +49,3 @@ private_key = {{ slaprunner['private_key'] }} [gitclient] git = {{ slaprunner['git-binary'] }} - -[supervisorctl] -forbid_supervisord_automatic_launch = true -- 2.30.9