Merge branch 'hotfix-0.1.5' into stable

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.1.5
+  - Upgrade baseimage: osixia/light-baseimage:0.1.1
+
 ## 0.1.4
   - Use light-baseimage
 

Makefile

@@ -1,5 +1,5 @@
 NAME = osixia/keepalived
-VERSION = 0.1.4
+VERSION = 0.1.5
 
 .PHONY: all build test tag_latest release
 

image/Dockerfile

@@ -1,4 +1,4 @@
-FROM osixia/light-baseimage:0.1.0
+FROM osixia/light-baseimage:0.1.1
 MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
 
 # Keepalived version

image/env.yaml

@@ -1,7 +1,7 @@
 KEEPALIVED_INTERFACE: eth0
 KEEPALIVED_PASSWORD: d0cker
 
-# for electing MASTER, highest priority wins.
+# For electing MASTER, highest priority wins.
 # to be MASTER, make 50 more than other machines
 KEEPALIVED_PRIORITY: 150
 

image/service/keepalived/assets/notify.sh

@@ -16,16 +16,16 @@ NAME=$2
 STATE=$3
 
 case $STATE in
-        "MASTER") logger "I'm the MASTER! Whup whup."
+        "MASTER") logger -s -t keepalived-notify "I'm the MASTER! Whup whup."
                   exit 0
                   ;;
-        "BACKUP") logger "Ok, i'm just a backup, great."
+        "BACKUP") logger -s -t keepalived-notify "Ok, i'm just a backup, great."
                   exit 0
                   ;;
-        "FAULT")  logger "Fault, what ?"
+        "FAULT")  logger -s -t keepalived-notify "Fault, what ?"
                   exit 0
                   ;;
-        *)        logger "Unknown state"
+        *)        logger -s -t keepalived-notify "Unknown state"
                   exit 1
                   ;;
 esac