Deploy: fqdn match via local config lookup

diff --git a/doc/todo.rst b/doc/todo.rst
index cce95e90c2348c11aa1a444e47ebb2266fa00d51..67f4d66bb6063c908df8830a4dc3b7d5f501d5d1 100644 (file)
--- a/doc/todo.rst
+++ b/doc/todo.rst
@@ -5,6 +5,6 @@ TODO
 - metrics and alarms subsystem.
 - deploy:
     - lockfile.
-    - fqdn match via local config lookup.
+    - error handling.
     - check hostname and required node configuration.
     - log applied version and date (in the node and in the repo).

diff --git a/lib/hydra/deploy b/lib/hydra/deploy
index 87cc8cf826a63f32c755842114c0ba78556adb88..ceacc3e6820f92ab9dca8d1535894ba088a5ac2e 100644 (file)
--- a/lib/hydra/deploy
+++ b/lib/hydra/deploy
@@ -22,9 +22,16 @@ function hydra_deploy_setup {
     # Deploy in a remote host
     if [ ! -z "$2" ]; then
       NODE="$2"
+      FQDN="$(basename `find $HYDRA_FOLDER/puppet/config/node/ -name $NODE'.*' | head -n 1` .yaml)"
+
+      # Check for config/node name
+      if [ -z "$FQDN" ]; then
+        echo "Cannot find config for $NODE."
+        exit 1
+      fi
+
       DEPLOY_BASE="/etc"
       DEPLOY_COMMAND="$HYDRA_CONNECT $NODE sudo"
-      FQDN="`$DEPLOY_COMMAND cat /etc/hostname`"
       DEPLOY_OPTS="$HYDRA_FOLDER/puppet/ $NODE:/etc/puppet/"
       DEPLOY_DEST="$FQDN:"
       RSYNC_PATH="sudo rsync -q"