Merge pull request #460 from asteven/fix-hostdir

Fix hostdir

cdist/conf/type/__consul_check/man.rst

@@ -21,18 +21,17 @@ None.
 
 OPTIONAL PARAMETERS
 -------------------
-interval
+docker-container-id
-   the interval in which the script given with --script should be run
+   the id of the docker container to run
 
-script
+http
-   the shell command to run every --interval
+   the url to check
-
-ttl
-   how long a check is considered healthy without being updated through the
-   HTTP interfave
 
 id
-   Defaults to --name
+   The id of this check.
+
+interval
+   the interval in which the check should run
 
 name
    The name of this check. Defaults to __object_id
@@ -40,9 +39,34 @@ name
 notes
    human readable description
 
+script
+   the shell command to run
+
+service-id
+   the id of the service this check is bound to
+
+shell
+   the shell to run inside the docker container
+
 state
    if this check is 'present' or 'absent'. Defaults to 'present'.
 
+status
+   specify the initial state of this health check
+
+tcp
+   the host and port to check
+
+timeout
+   after how long to timeout checks which take to long
+
+token
+   ACL token to use for interacting with the catalog
+
+ttl
+   how long a TTL check is considered healthy without being updated through the
+   HTTP interface
+
 
 EXAMPLES
 --------
@@ -72,5 +96,5 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2015 Steven Armstrong. Free use of this software is
+Copyright \(C) 2015-2016 Steven Armstrong. Free use of this software is
 granted under the terms of the GNU General Public License version 3 (GPLv3).

cdist/conf/type/__consul_check/manifest

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# 2015 Steven Armstrong (steven-cdist at armstrong.cc)
+# 2015-2016 Steven Armstrong (steven-cdist at armstrong.cc)
 #
 # This file is part of cdist.
 #
@@ -24,12 +24,24 @@ conf_file="check_${name}.json"
 state="$(cat "$__object/parameter/state")"
 
 # Sanity checks
-if [ -f "$__object/parameter/script" -a -f "$__object/parameter/ttl" ]; then
+if [ -f "$__object/parameter/ttl" ]; then
-   echo "Use either --script together with --interval OR --ttl, but not both" >&2
+   for conflicts_ttl in 'docker-container-id' 'http' 'script' 'tcp' 'timeout'; do
+      if [ -f "$__object/parameter/${conflicts_ttl}" ]; then
+         echo "Can not use --ttl together with --${conflicts_ttl}." >&2
          exit 1
+      fi
+   done
 fi
-if [ -f "$__object/parameter/script" -a ! -f "$__object/parameter/interval" ]; then
+if [ ! -f "$__object/parameter/interval" ]; then
-   echo "When using --script you must also define --interval" >&2
+   for requires_interval in 'docker-id' 'http' 'script' 'tcp'; do
+      if [ -f "$__object/parameter/${requires_interval}" ]; then
+         echo "When using --${requires_interval} you must also define --interval." >&2
+         exit 1
+      fi
+   done
+fi
+if [ -f "$__object/parameter/docker-container-id" -a ! -f "$__object/parameter/script" ]; then
+   echo "When using --docker-container-id you must also define --script." >&2
    exit 1
 fi
 
@@ -40,11 +52,7 @@ printf '   "check": {\n'
 printf '      "name": "%s"\n' "$name"
 for param in $(ls "$__object/parameter/"); do
    case "$param" in
-      state|name|interval) continue ;;
+      state|name) continue ;;
-      script)
-         printf '      ,"script": "%s"\n' "$(cat "$__object/parameter/script")"
-         printf '      ,"interval": "%s"\n' "$(cat "$__object/parameter/interval")"
-      ;;
       *)
          key="$(echo "$param" | tr '-' '_')"
          printf '      ,"%s": "%s"\n' "$key" "$(cat "$__object/parameter/$param")"

cdist/conf/type/__consul_check/parameter/optional

@@ -1,7 +1,15 @@
+docker-container-id
+http
 id
 interval
 name
 notes
 script
+service-id
+shell
 state
+status
+tcp
+timeout
+token
 ttl

cdist/conf/type/__consul_template/files/versions/0.10.0/source

@@ -1 +1 @@
-https://github.com/hashicorp/consul-template/releases/download/v0.10.0/consul-template_0.10.0_linux_amd64.tar.gz
+https://releases.hashicorp.com/consul-template/0.10.0/consul-template_0.10.0_linux_amd64.zip

cdist/conf/type/__consul_template/files/versions/0.15.0/cksum

@@ -0,0 +1 @@
+2643547924 12487232 consul-template

cdist/conf/type/__consul_template/files/versions/0.15.0/source

@@ -0,0 +1 @@
+https://releases.hashicorp.com/consul-template/0.15.0/consul-template_0.15.0_linux_amd64.zip

cdist/conf/type/__consul_template/manifest

@@ -52,7 +52,7 @@ __staged_file /usr/local/bin/consul-template \
    --source "$(cat "$version_dir/source")" \
    --cksum "$(cat "$version_dir/cksum")" \
    --fetch-command 'curl -s -L "%s"' \
-   --prepare-command 'tar -xzf "%s"; cat consul-template_*/consul-template' \
+   --prepare-command 'unzip -p "%s"' \
    --state "$state" \
    --group root \
    --owner root \

cdist/conf/type/__consul_template/parameter/default/version

@@ -1 +1 @@
-0.10.0
+0.15.0

cdist/conf/type/__consul_template_template/man.rst

@@ -37,6 +37,14 @@ source-file
 state
    if this template is 'present' or 'absent'. Defaults to 'present'.
 
+wait
+   The `minimum(:maximum)` time to wait before rendering a new template to
+   disk and triggering a command, separated by a colon (`:`). If the optional
+   maximum value is omitted, it is assumed to be 4x the required minimum value.
+   This is a numeric time with a unit suffix ("5s"). There is no default value.
+   The wait value for a template takes precedence over any globally-configured
+   wait.
+
 
 EXAMPLES
 --------
@@ -52,6 +60,7 @@ EXAMPLES
 
     # upload a local file to the target and configure it
     __consul_template_template nginx \
+       --wait '2s:6s' \
        --source-file "$__manifest/files/nginx.ctmpl" \
        --destination /etc/nginx/nginx.conf \
        --command 'service nginx restart'
@@ -69,5 +78,5 @@ Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 COPYING
 -------
-Copyright \(C) 2015 Steven Armstrong. Free use of this software is
+Copyright \(C) 2015-2016 Steven Armstrong. Free use of this software is
 granted under the terms of the GNU General Public License version 3 (GPLv3).

cdist/conf/type/__consul_template_template/manifest

@@ -55,7 +55,7 @@ for param in $(ls "$__object/parameter/"); do
          printf '   source = "%s"\n' "$destination"
 
       ;;
-      source|destination|command)
+      source|destination|command|wait)
          printf '   %s = "%s"\n' "$param" "$(cat "$__object/parameter/$param")"
       ;;
       *)

cdist/conf/type/__consul_template_template/parameter/optional

@@ -2,3 +2,4 @@ command
 source
 source-file
 state
+wait

cdist/exec/local.py

@@ -29,6 +29,7 @@ import subprocess
 import shutil
 import logging
 import tempfile
+import hashlib
 
 import cdist
 import cdist.message
@@ -59,8 +60,10 @@ class Local(object):
             base_path_parent = base_path
         else:
             base_path_parent = tempfile.mkdtemp()
-            import atexit
+            # TODO: the below atexit hook nukes any debug info we would have
-            atexit.register(lambda: shutil.rmtree(base_path_parent))
+            #  if cdist exits with error.
+            #import atexit
+            #atexit.register(lambda: shutil.rmtree(base_path_parent))
         self.hostdir = self._hostdir()
         self.base_path = os.path.join(base_path_parent, self.hostdir)
 
@@ -94,11 +97,9 @@ class Local(object):
             return None
 
     def _hostdir(self):
-        if os.path.isabs(self.target_host):
+        # Do not assume target_host is anything that can be used as a directory name.
-            hostdir = self.target_host[1:]
+        # Instead use a hash, which is know to work as directory name.
-        else:
+        return hashlib.md5(self.target_host.encode('utf-8')).hexdigest()
-            hostdir = self.target_host
-        return hostdir
 
     def _init_log(self):
         self.log = logging.getLogger(self.target_host)
@@ -238,7 +239,7 @@ class Local(object):
                         message_prefix=message_prefix)
 
     def save_cache(self):
-        destination = os.path.join(self.cache_path, self.hostdir)
+        destination = os.path.join(self.cache_path, self.target_host)
         self.log.debug("Saving " + self.base_path + " to " + destination)
 
         try: