Check for sudo config at the remote site

diff --git a/doc/todo.rst b/doc/todo.rst
index 999ecb0bdbb531e394069b0eaf353c28dcb6c8b2..64b4b638adcd9fa2edf6a00f2ed9bc1ca5c29965 100644 (file)
--- a/doc/todo.rst
+++ b/doc/todo.rst
@@ -6,7 +6,6 @@ TODO
  - lockfile.
  - one-step ssh+sudo deployment.
  - simple deployer using just rsync.
- - check for sudo config at the remote site.
 - compile:
   - per-node compiled files (node/nodename.yaml and secrets/node/nodename.yaml).
   - backups: automatic definitions for per-node backup::users.

diff --git a/share/hydra/deploy b/share/hydra/deploy
index 3cec85f6f7280b9172bafb2adac0123bbacf1e61..8c4582804cd63766f4f6e99329e3595ac3513f90 100755 (executable)
--- a/share/hydra/deploy
+++ b/share/hydra/deploy
@@ -51,6 +51,11 @@ for node in $NODES; do
     FOLDER=$node
     hydra_deploy_setup folder $FOLDER || continue
 
+    if ! sudo -n true; then
+      echo "Please set passwordless sudo on localhost."
+      continue
+    fi
+
     # Check if puppet is installed
     if [ ! -e "$FOLDER/usr/bin/puppet" ]; then
       echo "Installing dependencies..."
@@ -78,6 +83,11 @@ for node in $NODES; do
   elif [ "$node" == "localhost" ] || [ "$node" == "`facter fqdn`" ] || [ "$node" == "`facter hostname`" ]; then
     echo "Deploying to localhost..."
 
+    if ! sudo -n true; then
+      echo "Please set passwordless sudo on localhost."
+      continue
+    fi
+
     # Setup deploy environment
     hydra_deploy_setup || continue
 
@@ -106,6 +116,11 @@ for node in $NODES; do
     # Check if puppet is installed
     $HYDRA_CONNECT $FQDN <<EOF
     ##### BEGIN REMOTE SCRIPT #####
+    if ! sudo -n true; then
+      echo "Please set passwordless sudo on $FQDN."
+      exit 1
+    fi
+
     if ! which puppet &> /dev/null; then
       echo "Installing dependencies..."
       sudo apt-get update