From 41e6becc320af09a089e2741414baa371b84a95e Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sun, 24 Jun 2012 10:02:55 +0100 Subject: [PATCH] better way of being defensive Signed-off-by: Stephen Gran --- modules/ssh/templates/authorized_keys.erb | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/modules/ssh/templates/authorized_keys.erb b/modules/ssh/templates/authorized_keys.erb index 2b00e56f..eb104389 100644 --- a/modules/ssh/templates/authorized_keys.erb +++ b/modules/ssh/templates/authorized_keys.erb @@ -22,17 +22,15 @@ localkeys <%= ganetikeys = [] allnodeinfo = scope.lookupvar('site::allnodeinfo') - if scope.lookupvar('::cluster_nodes') - scope.lookupvar('::cluster_nodes').split.sort.each do |node| - if allnodeinfo.has_key?(node) - ganetikeys << "# for ganeti: #{allnodeinfo[node]['hostname'].to_s}" - ganetikeys << "from=\"#{allnodeinfo[node]['ipHostNumber'].join(',')}\" #{allnodeinfo[node]['sshRSAHostKey'].to_s}" - else - ganetikeys << "# host #{node} not found in allnodeinfo" - end + scope.lookupvar('::cluster_nodes').to_a.flatten.split.sort.each do |node| + if allnodeinfo.has_key?(node) + ganetikeys << "# for ganeti: #{allnodeinfo[node]['hostname'].to_s}" + ganetikeys << "from=\"#{allnodeinfo[node]['ipHostNumber'].join(',')}\" #{allnodeinfo[node]['sshRSAHostKey'].to_s}" + else + ganetikeys << "# host #{node} not found in allnodeinfo" end - ganetikeys.join("\n"); end + ganetikeys.join("\n"); %> # # DSA -- 2.39.2