Merge branch 'master' of github.com:itzg/dockerfiles

This commit is contained in:
Geoff Bourne 2016-11-13 14:59:47 -06:00
commit de6d7a64ac

View file

@ -49,7 +49,7 @@ setup_clustering() {
fi fi
if [ -n "$MIN_MASTERS" ]; then if [ -n "$MIN_MASTERS" ]; then
OPTS="$OPTS --discovery.zen.minimum_master_nodes=$MIN_MASTERS" OPTS="$OPTS -E discovery.zen.minimum_master_nodes=$MIN_MASTERS"
fi fi
} }
@ -72,15 +72,15 @@ setup_personality() {
if [ -n "$TYPE" ]; then if [ -n "$TYPE" ]; then
case $TYPE in case $TYPE in
MASTER) MASTER)
OPTS="$OPTS --node.master=true --node.data=false" OPTS="$OPTS -E node.master=true -E node.data=false"
;; ;;
GATEWAY) GATEWAY)
OPTS="$OPTS --node.master=false --node.data=false" OPTS="$OPTS -E node.master=false -E node.data=false"
;; ;;
DATA|NON_MASTER) DATA|NON_MASTER)
OPTS="$OPTS --node.master=false --node.data=true" OPTS="$OPTS -E node.master=false -E node.data=true"
;; ;;
*) *)