X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssh%2Ftemplates%2Fauthorized_keys.erb;h=25083be0d4a0573efe7ba5424bae79e686be30c4;hb=4c5c4151615376e493908971c838fd4ed397b99a;hp=2738aef54c43a2fbc71b0674213b19740891d440;hpb=4ee17aa1cb1dbd80715204aa062faa4d920c4070;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssh/templates/authorized_keys.erb b/modules/ssh/templates/authorized_keys.erb
index 2738aef54..25083be0d 100644
--- a/modules/ssh/templates/authorized_keys.erb
+++ b/modules/ssh/templates/authorized_keys.erb
@@ -19,10 +19,20 @@ ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAwbRijHuvIC6cZUZwUfqLT5t/4GRvqiBBmYXkRRhwMajT
 end
 localkeys
 %>
-<%= ganetikeys = case fqdn
-        when "tristano.debian.org", "pasquini.debian.org" then "ssh-dss AAAAB3NzaC1kc3MAAACBAJ2CX2dqGozYF30+/A44SoObQI4/OL17Hyprsxv9UynMsZHdVDckEQFMMp2M80dLOXsVRzC4DGxUoCzj9chZ5m5ZilwNV09hJxcqRlqKsQMZsCwDNhpCZo9sjrmpn2UUQQdAhFivIIeoqfYCwlc4jHoR8Uc1v1Okv4WXDnYINhizAAAAFQDNy8fH4Gd0kErcY9LT+89xPQNq3QAAAIAks1ud/arXFb7FepYZHRv7BzA4wrEiZ0A/3Acp/vR23ph4qEOucWxQC+Bpf4AqNWCctt5p0SYWoEeO78eNvMI/xewaOEBK/lzecPdvlU/bC35HRrfz8jajXto+p7BBo57RzwOauDazrT0VfYifXE1/b2yNrvY6zgU/vkNOa7a/RQAAAIBkS/X7/nOEKl2RyJMSzZFsCn+C1/swAaTrqLCvcA+5OgZow68yy8jpt/MUSmBzVxU+cbAHlgZgF93P3TgXc2jcDKcB4cEJIEyRVWJow6KXY4hygAt7s4Y95rauxanjEJ28bNqdmwktA0LOhJVyVTeY1z2P19jLvVJNSUrSRGU80A== root@tristano.debian.org (ganeti)\nssh-dss AAAAB3NzaC1kc3MAAACBAPozGq+2RqyYgIk9pckBqNd7RgjhAUvnthmj9yAREI6raDCeT7TSY0MpZV0qm7ZW/kL/klHaugSCUCMbZe8EVGnMdFWAP+h8AJMlSHjjNXdq8K/Ulq/Cap1D7zAx+PkEhl9e9XprrAciPffji9Hd3murKS+navZ/YmEDFGq4kSZ5AAAAFQDSHpoCNVsY7WkWocVI7xS1+NtIxwAAAIEA4HpymvPT0htwiGhOz94ARhioo54IwIMdzZwL1dEFlCiPNa07BWwlU034L/hLTMe5+Qc0Jey77FTNVKH0E+MHb8xkC/MtSLMjIZ7POVS0vlc90b3m8yHO/pFFyqtPPlvOoNzeDqo7Wjdb9DQpaQhreHvadAGXFzGT4PdUcKevz/wAAACBAMPdM9wukVM0EHjxMiIQOpunArtWLeT2tiQiABmtiARHn6/3931Cf8lm6k2l3zLZfdoTWvoCE7G0a2YGzBZnC7KmqYGjpRTL4xssGS3pJl+zDsou88t5m+q89ln9z9Og/x6fmNq6onbZE0VmXgMSujEtxcwMAz6kZAGv3Z76d+EF root@pasquini.debian.org (ganeti)"
-end
-ganetikeys
+<%=
+  ganetikeys = []
+  allnodeinfo = scope.lookupvar('site::allnodeinfo')
+  if scope.lookupvar('::cluster').to_s != 'undefined'
+    scope.lookupvar('::cluster_nodes').to_s.split.sort.each do |node|
+      if allnodeinfo.has_key?(node)
+        ganetikeys << "# for ganeti cluster #{scope.lookupvar('::cluster').to_s}: #{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
+    end
+  end
+  ganetikeys.join("\n");
 %>
 #
 # DSA