From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 29 May 2013 13:20:30 +0000 (+0000)
Subject: puppetmaster -> wheezy, Pt III
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=0596a308447a762e2cd07f65ed157b48f12ffd3a;p=mirror%2Fdsa-puppet.git

puppetmaster -> wheezy, Pt III
---

diff --git a/modules/roles/templates/dakmaster/conf-builddlist.erb b/modules/roles/templates/dakmaster/conf-builddlist.erb
index d216cdc9a..a9df167a2 100644
--- a/modules/roles/templates/dakmaster/conf-builddlist.erb
+++ b/modules/roles/templates/dakmaster/conf-builddlist.erb
@@ -11,7 +11,7 @@
   scope.lookupvar('site::allnodeinfo').keys.sort.each do |node|
     next unless scope.lookupvar('site::allnodeinfo')[node]['purpose']
     if scope.lookupvar('site::allnodeinfo')[node]['purpose'].include?('buildd')
-      lines << "  # #{scope.lookupvar('site::allnodeinfo')[node]['hostname'].to_s}"
+      lines << "  # #{scope.lookupvar('site::allnodeinfo')[node]['hostname'][0]}"
       scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |addr|
         lines << "  allow from #{addr}"
       end
diff --git a/modules/ssh/templates/authorized_keys.erb b/modules/ssh/templates/authorized_keys.erb
index 9c81654c1..5a62a15c0 100644
--- a/modules/ssh/templates/authorized_keys.erb
+++ b/modules/ssh/templates/authorized_keys.erb
@@ -24,8 +24,8 @@ localkeys
   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}"
+        ganetikeys << "# for ganeti cluster #{scope.lookupvar('::cluster').to_s}: #{allnodeinfo[node]['hostname'][0]}"
+        ganetikeys << "from=\"#{allnodeinfo[node]['ipHostNumber'].join(',')}\" #{allnodeinfo[node]['sshRSAHostKey'][0]}"
       else
         ganetikeys << "# host #{node} not found in allnodeinfo"
       end
@@ -50,8 +50,8 @@ ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAuGJnElqbhgLtmJp/de8s42cAwKrkAhFq5u8EAkauEv6B
    when "beethoven.debian.org" then
      out = ''
      scope.lookupvar('site::allnodeinfo').keys.sort.each do |node|
-       out += '# ' + scope.lookupvar('site::allnodeinfo')[node]['hostname'].to_s + '
-command="/usr/lib/da-backup/da-backup-ssh-wrap ' + scope.lookupvar('site::allnodeinfo')[node]['hostname'].to_s + '",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="' + scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].join(',') + '" ' + scope.lookupvar('site::allnodeinfo')[node]['sshRSAHostKey'].to_s + '
+       out += '# ' + scope.lookupvar('site::allnodeinfo')[node]['hostname'][0] + '
+command="/usr/lib/da-backup/da-backup-ssh-wrap ' + scope.lookupvar('site::allnodeinfo')[node]['hostname'][0] + '",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="' + scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].join(',') + '" ' + scope.lookupvar('site::allnodeinfo')[node]['sshRSAHostKey'][0] + '
 
 '
      end