Skip to content

Commit fe6ead3

Browse files
committed
Merge branch 'hotfix-0.1.5' into stable
2 parents 4cbbbc1 + d67d8be commit fe6ead3

File tree

5 files changed

+10
-7
lines changed

5 files changed

+10
-7
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Changelog
22

3+
## 0.1.5
4+
- Upgrade baseimage: osixia/light-baseimage:0.1.1
5+
36
## 0.1.4
47
- Use light-baseimage
58

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
NAME = osixia/keepalived
2-
VERSION = 0.1.4
2+
VERSION = 0.1.5
33

44
.PHONY: all build test tag_latest release
55

image/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM osixia/light-baseimage:0.1.0
1+
FROM osixia/light-baseimage:0.1.1
22
MAINTAINER Bertrand Gouny <[email protected]>
33

44
# Keepalived version

image/env.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
KEEPALIVED_INTERFACE: eth0
22
KEEPALIVED_PASSWORD: d0cker
33

4-
# for electing MASTER, highest priority wins.
4+
# For electing MASTER, highest priority wins.
55
# to be MASTER, make 50 more than other machines
66
KEEPALIVED_PRIORITY: 150
77

image/service/keepalived/assets/notify.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ NAME=$2
1616
STATE=$3
1717

1818
case $STATE in
19-
"MASTER") logger "I'm the MASTER! Whup whup."
19+
"MASTER") logger -s -t keepalived-notify "I'm the MASTER! Whup whup."
2020
exit 0
2121
;;
22-
"BACKUP") logger "Ok, i'm just a backup, great."
22+
"BACKUP") logger -s -t keepalived-notify "Ok, i'm just a backup, great."
2323
exit 0
2424
;;
25-
"FAULT") logger "Fault, what ?"
25+
"FAULT") logger -s -t keepalived-notify "Fault, what ?"
2626
exit 0
2727
;;
28-
*) logger "Unknown state"
28+
*) logger -s -t keepalived-notify "Unknown state"
2929
exit 1
3030
;;
3131
esac

0 commit comments

Comments
 (0)