From: Stephen Gran <steve@lobefin.net>
Date: Sun, 21 Feb 2010 03:24:14 +0000 (+0000)
Subject: move keyinfo to all hosts, as we want it for various other lookups
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7ff9a06b9c3affc9eaf3d28f9b8f00f685b7dd9a;p=mirror%2Fdsa-puppet.git

move keyinfo to all hosts, as we want it for various other lookups

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/manifests/site.pp b/manifests/site.pp
index 35de8860a..66d16224d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -17,6 +17,7 @@ node default {
     $localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.yaml")
     $nodeinfo  = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
     $hoster    = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
+    $keyinfo   = allnodeinfo("sshRSAHostKey", "ipHostNumber")
     notice("hoster for ${fqdn} is ${hoster}")
 
     $mxinfo   = allnodeinfo("mXRecord")
diff --git a/modules/ssh/manifests/init.pp b/modules/ssh/manifests/init.pp
index c6d1646a6..e2248f847 100644
--- a/modules/ssh/manifests/init.pp
+++ b/modules/ssh/manifests/init.pp
@@ -4,13 +4,6 @@ class ssh {
                 openssh-server: ensure => installed;
         }
 
-        case $hostname {
-                bartok, beethoven: {
-                    $keyinfo = allnodeinfo("sshRSAHostKey", "ipHostNumber")
-                }
-        }
-
-
 	file { "/etc/ssh/ssh_config":
 		source  => [ "puppet:///ssh/ssh_config" ],
 		require => Package["openssh-client"]