From cae2ac26e2652d4521614236285a550e3f115483 Mon Sep 17 00:00:00 2001 From: Angus Salkeld Date: Tue, 16 Jul 2013 09:08:13 +1000 Subject: [PATCH] Don't reload haproxy and use ensureRunning=true the ensureRunning option results in cfn-hup doing a restart and the hook does a reload. these two options result in the failed state of haproxy. This patch rolls the two into "reload-or-restart", which is run from cron. bug 1201621 Change-Id: Idb42b3915cb86c613876b67abf1c6999972e19e2 --- heat/engine/resources/loadbalancer.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/heat/engine/resources/loadbalancer.py b/heat/engine/resources/loadbalancer.py index a30dc1e4..5b6b7cd0 100644 --- a/heat/engine/resources/loadbalancer.py +++ b/heat/engine/resources/loadbalancer.py @@ -68,8 +68,7 @@ lb_template = r''' }, "services": { "systemd": { - "crond" : { "enabled" : "true", "ensureRunning" : "true" }, - "haproxy" : { "enabled": "true", "ensureRunning": "true" } + "crond" : { "enabled" : "true", "ensureRunning" : "true" } } }, "files": { @@ -109,7 +108,7 @@ lb_template = r''' "[reload]\n", "triggers=post.update\n", "path=Resources.LB_instance.Metadata\n", - "action=systemctl reload haproxy.service\n", + "action=systemctl reload-or-restart haproxy.service\n", "runas=root\n" ]]}, "mode" : "000400", -- 2.45.2