sparrowhawk/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #528 from ungleich/consul_improvements

Browse source 
consul: add http check; add new version
This commit is contained in:
Darko Poljak 2017-06-01 09:00:16 +02:00 committed by GitHub
commit 1545d9f018
7 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cdist/conf/type/__consul/files/versions/0.8.1/cksum Normal file
View file

@ -0,0 +1 @@
283033689 36101209 consul

1
cdist/conf/type/__consul/files/versions/0.8.1/source Normal file
View file

@ -0,0 +1 @@
https://releases.hashicorp.com/consul/0.8.1/consul_0.8.1_linux_amd64.zip

2
cdist/conf/type/__consul/manifest
View file

@ -23,7 +23,7 @@
os=$(cat "$__global/explorer/os") os=$(cat "$__global/explorer/os")
case "$os" in case "$os" in
scientific|centos|redhat|ubuntu|debian|archlinux|gentoo) scientific|centos|redhat|ubuntu|debian|devuan|archlinux|gentoo)
# any linux should work # any linux should work
: :
;; ;;

12
cdist/conf/type/__consul_agent/manifest
View file

@ -23,7 +23,7 @@
os=$(cat "$__global/explorer/os") os=$(cat "$__global/explorer/os")
case "$os" in case "$os" in
scientific|centos|debian|redhat|ubuntu) scientific|centos|debian|devuan|redhat|ubuntu)
# whitelist safeguard # whitelist safeguard
: :
;; ;;
@ -215,7 +215,11 @@ case "$os" in
esac esac
;; ;;
ubuntu) devuan)
init_upstart init_sysvinit debian
;; ;;
ubuntu)
init_upstart
;;
esac esac

3
cdist/conf/type/__consul_service/man.rst
View file

@ -24,6 +24,9 @@ OPTIONAL PARAMETERS
check-interval check-interval
the interval in which the script given with --check-script should be run the interval in which the script given with --check-script should be run
check-http
the URL to check for HTTP 200-ish status every --check-interval
check-script check-script
the shell command to run every --check-interval the shell command to run every --check-interval

10
cdist/conf/type/__consul_service/manifest
View file

@ -32,6 +32,10 @@ if [ -f "$__object/parameter/check-script" -a ! -f "$__object/parameter/check-in
echo "When using --check-script you must also define --check-interval" >&2 echo "When using --check-script you must also define --check-interval" >&2
exit 1 exit 1
fi fi
if [ -f "$__object/parameter/check-http" -a ! -f "$__object/parameter/check-interval" ]; then
echo "When using --check-http you must also define --check-interval" >&2
exit 1
fi
# Generate json config file # Generate json config file
( (
@ -52,6 +56,12 @@ for param in $(ls "$__object/parameter/"); do
printf ' "ttl": "%s"\n' "$(cat "$__object/parameter/check-ttl")" printf ' "ttl": "%s"\n' "$(cat "$__object/parameter/check-ttl")"
printf ' }\n' printf ' }\n'
;; ;;
check-http)
printf ' ,"check": {\n'
printf ' "http": "%s"\n' "$(cat "$__object/parameter/check-http")"
printf ' ,"interval": "%s"\n' "$(cat "$__object/parameter/check-interval")"
printf ' }\n'
;;
tag) tag)
# create json array from newline delimited file # create json array from newline delimited file
tags="$(awk '{printf "\""$1"\","}' "$__object/parameter/tag")" tags="$(awk '{printf "\""$1"\","}' "$__object/parameter/tag")"

1
cdist/conf/type/__consul_service/parameter/optional
View file

@ -1,3 +1,4 @@
check-http
check-interval check-interval
check-script check-script
check-ttl check-ttl