Merge pull request #403 from thekleine/consul-version-0.5.2

Consul version 0.5.2
remotes/origin/4.0
Nico Schottelius 9 years ago
commit 68370db5c3
  1. 1
      cdist/conf/type/__consul/files/versions/0.5.2/cksum
  2. 1
      cdist/conf/type/__consul/files/versions/0.5.2/source
  3. 6
      cdist/conf/type/__consul_agent/manifest
  4. 1
      cdist/conf/type/__consul_agent/parameter/optional
  5. 1
      cdist/conf/type/__consul_agent/parameter/optional_multiple

@ -0,0 +1 @@
2207534901 18245010 consul

@ -0,0 +1 @@
https://dl.bintray.com/mitchellh/consul/0.5.2_linux_amd64.zip

@ -109,6 +109,12 @@ for param in $(ls "$__object/parameter/"); do
# remove trailing ,
printf ' ,"retry_join": [%s]\n' "${retry_join%*,}"
;;
retry-join-wan)
# join multiple parameters into json array over wan
retry_join_wan="$(awk '{printf "\""$1"\","}' "$__object/parameter/retry-join-wan")"
# remove trailing ,
printf ' ,"retry_join_wan": [%s]\n' "${retry_join_wan%*,}"
;;
bootstrap-expect)
# integer key=value parameters
key="$(echo "$param" | tr '-' '_')"

@ -17,3 +17,4 @@ key-file-source
node-name
user
state
advertise-wan

Loading…
Cancel
Save