From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 5 Jan 2014 13:58:55 +0000 (-0200)
Subject: Nodes: adapt to the new nodo module format for node selection
X-Git-Tag: 0.2~6
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=1ca957ff6f243a319344b7d607d7184f667a0951;p=hydra.git

Nodes: adapt to the new nodo module format for node selection
---

diff --git a/README b/README
index f85acd5..d3a453a 100644
--- a/README
+++ b/README
@@ -17,5 +17,4 @@ Hydra:
   - Sync: clone hydra configuration repository that should be created by the new init action.
   - Sync: split between public and private repositories.
   - Sync: Git clone URL recommendation which support for both git-annex and non-standard port.
-  - Nodes: adapt to the new nodo module format for node selection.
   - Uniform syntax for specifying nodes (either by hostname or fqdn) on deploy and import-key.
diff --git a/share/hydra/nodes b/share/hydra/nodes
index 455b00b..b070680 100755
--- a/share/hydra/nodes
+++ b/share/hydra/nodes
@@ -54,9 +54,13 @@ hydra_node_files
 
 # Get nodes
 if [ ! -z "$CLASS" ]; then
-  FILES="`hydra_node_lines | cut -d ':' -f 1`"
-  FILES="`grep nodo::$CLASS $FILES | cut -d ':' -f 1`"
-  hydra_nodes
+  hydra_nodes | while read node; do
+    find $PUPPET/hiera -name "$node.yaml"
+  done | while read candidate; do
+    if grep -e "$CLASS" $candidate | grep -qe "^nodo::role"; then
+      basename $candidate .yaml
+    fi
+  done
 else
   hydra_nodes
 fi