Initial working version for a node tool and misc changes

2 files changed, 28 insertions, 5 deletions

diff --git a/share/hydra/nodes b/share/hydra/nodes
index 93593e1..c7e4c4c 100755
--- a/share/hydra/nodes
+++ b/share/hydra/nodes
@@ -2,3 +2,24 @@
 #
 # Node tool.
 #
+
+# Default node retrieval method
+function hydra_get_nodes {
+  # See http://www.mail-archive.com/puppet-users@googlegroups.com/msg01615.html
+  grep ^node $* | sed -e 's/^node //' | awk -F, '{for(i=1;i<=NF;i++) {print $i}}' | cut -d "'" -f2
+}
+
+# Load functions
+source $APP_BASE/lib/hydra/functions || exit 1
+
+# Load config
+hydra_config_load
+
+# Validation
+if [ -z "$PUPPET" ]; then
+  echo "No PUPPET parameter defined at $HYDRA preferences."
+  exit 1
+fi
+
+# Get nodes
+hydra_get_nodes $PUPPET/manifests/nodes/*
diff --git a/share/hydra/register b/share/hydra/register
index 5ef0a9d..e3d3ed6 100755
--- a/share/hydra/register
+++ b/share/hydra/register
@@ -3,10 +3,13 @@
 # Register an existing hydra
 #
 
-CONFIG="$HOME/.hydra/config"
-PREFERENCES="$HOME/.hydra/$HYDRA"
+# Load functions
+source $APP_BASE/lib/hydra/functions || exit 1
+
+# Command line arguments
 BASEDIR="$1"
 
+# Validation
 if [ -z "$BASEDIR" ]; then
   echo "Usage: hydra [hydra] register <path>"
   exit 1
@@ -15,15 +18,14 @@ elif grep -q -e "^$HYDRA=" $CONFIG &> /dev/null; then
   exit 1
 fi
 
-# Folder setup
-mkdir -p `dirname $CONFIG`
-
 # Reparse basedir to force absolute folder
 BASEDIR="`cd $BASEDIR && pwd`"
 
 # Add entry
 echo "Registering hydra $HYDRA..."
+mkdir -p $BASEDIR
 chmod 700 $BASEDIR
+hydra_config_load
 echo "$HYDRA=\"$BASEDIR\"" >> $CONFIG
 
 # Puppet configuration