From ef98c54989cc8577e49582e7d7f3a6e529ce11dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20H=C3=BCrlimann?= Date: Fri, 14 Aug 2015 22:54:55 +0200 Subject: [PATCH 1/4] Added retry-join-wan to consul parameters --- cdist/conf/type/__consul_agent/manifest | 6 ++++++ cdist/conf/type/__consul_agent/parameter/optional_multiple | 1 + 2 files changed, 7 insertions(+) diff --git a/cdist/conf/type/__consul_agent/manifest b/cdist/conf/type/__consul_agent/manifest index f8cace94..9dd51b28 100755 --- a/cdist/conf/type/__consul_agent/manifest +++ b/cdist/conf/type/__consul_agent/manifest @@ -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 '-' '_')" diff --git a/cdist/conf/type/__consul_agent/parameter/optional_multiple b/cdist/conf/type/__consul_agent/parameter/optional_multiple index 12cd064c..740e4d7f 100644 --- a/cdist/conf/type/__consul_agent/parameter/optional_multiple +++ b/cdist/conf/type/__consul_agent/parameter/optional_multiple @@ -1 +1,2 @@ retry-join +retry-join-wan From 0057ee5558327342ff6cbd4048474cbe6cb5fdd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20H=C3=BCrlimann?= Date: Sat, 15 Aug 2015 22:04:27 +0200 Subject: [PATCH 2/4] Added new version for consul --- cdist/conf/type/__consul/files/versions/0.5.2/cksum | 1 + cdist/conf/type/__consul/files/versions/0.5.2/source | 1 + 2 files changed, 2 insertions(+) create mode 100644 cdist/conf/type/__consul/files/versions/0.5.2/cksum create mode 100644 cdist/conf/type/__consul/files/versions/0.5.2/source diff --git a/cdist/conf/type/__consul/files/versions/0.5.2/cksum b/cdist/conf/type/__consul/files/versions/0.5.2/cksum new file mode 100644 index 00000000..1c077266 --- /dev/null +++ b/cdist/conf/type/__consul/files/versions/0.5.2/cksum @@ -0,0 +1 @@ +2207534901 18245010 consul diff --git a/cdist/conf/type/__consul/files/versions/0.5.2/source b/cdist/conf/type/__consul/files/versions/0.5.2/source new file mode 100644 index 00000000..991034ce --- /dev/null +++ b/cdist/conf/type/__consul/files/versions/0.5.2/source @@ -0,0 +1 @@ +https://dl.bintray.com/mitchellh/consul/0.5.2_linux_amd64.zip From 7de303147c972a7432cdf3178d56e1a0f23dc8a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20H=C3=BCrlimann?= Date: Fri, 14 Aug 2015 22:54:55 +0200 Subject: [PATCH 3/4] Added retry-join-wan to consul parameters From 90f3f81c390492d558d08e746fe8a43d3f2f686f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20H=C3=BCrlimann?= Date: Fri, 28 Aug 2015 01:25:05 +0200 Subject: [PATCH 4/4] Added advertise-wan as optional parameter for consul --- cdist/conf/type/__consul_agent/parameter/optional | 1 + 1 file changed, 1 insertion(+) diff --git a/cdist/conf/type/__consul_agent/parameter/optional b/cdist/conf/type/__consul_agent/parameter/optional index 8940023d..37aad8c1 100644 --- a/cdist/conf/type/__consul_agent/parameter/optional +++ b/cdist/conf/type/__consul_agent/parameter/optional @@ -17,3 +17,4 @@ key-file-source node-name user state +advertise-wan