1 files changed, 7 insertions, 1 deletions
diff --git a/share/hydra/deploy b/share/hydra/deploy
index d9d14a2..d8fd3f8 100755
--- a/share/hydra/deploy
+++ b/share/hydra/deploy
@@ -113,7 +113,7 @@ for node in $NODES; do
     # Setup deploy environment
     hydra_deploy_setup remote $node || continue
 
-    # Check if puppet is installed
+    # Check remote environment
     $HYDRA_CONNECT $FQDN <<EOF
     ##### BEGIN REMOTE SCRIPT #####
     if ! sudo -n true; then
@@ -121,6 +121,12 @@ for node in $NODES; do
       exit 1
     fi
 
+    if [ "\$(facter fqdn)" != "$FQDN" ]; then
+      echo "FQDN does not match:"
+      echo "Remote presents itself as \$(facter fqdn) instead of $FQDN"
+      exit 1
+    fi
+
     if ! which puppet &> /dev/null; then
       echo "Installing dependencies..."
       sudo apt-get update