Skip to content

Commit 70e8e68

Browse files
committed
Fix keepalived monit job
Previously the keepalived job template for monit was checking if the YML value `keepalived.enabled` was set to the string value `true`. Instead, we want to check if it's boolean value of `true`. This commit fixes that.
1 parent dc21db5 commit 70e8e68

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

ci/release_notes.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Improvements
2+
3+
In this release we've fixed a bug where keepalived was disabled, no matter the
4+
setting. The intended logic of "keepalived is enabled by default, disabled via
5+
`keepalived.enabled: false`" holds.

jobs/vip/monit

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ check process haproxy
44
stop program "/var/vcap/jobs/vip/bin/haproxy stop"
55
group vcap
66

7-
<% if p("keepalived.enabled") == "true" -%>
7+
<% if p("keepalived.enabled") %>
88
check process keepalived
99
with pidfile /var/vcap/sys/run/vip/keepalived.pid
1010
start program "/var/vcap/jobs/vip/bin/keepalived start"
1111
stop program "/var/vcap/jobs/vip/bin/keepalived stop"
1212
group vcap
13-
<% end -%>
13+
<% end %>

jobs/vip/spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ properties:
3636
default: 6432
3737

3838
keepalived.enabled:
39-
description: By default keepalived will be enabled. When we use dns, keepalived will be disabled.
39+
description: By default keepalived will be enabled. If you wish to roll your own VRRP-like system, disable this.
4040
default: true
4141

4242
keepalived.interface:

0 commit comments

Comments
 (0)