X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=bec319b45644ae51dc6308f6f62f91a650867c36;hb=72f40e1fd87426f75b0b6be202efc79893476ac2;hp=a55107b4cffe8259c4cc45d8090fa4db395ac708;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index a55107b4..bec319b4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -3,10 +3,10 @@ Package {
 }
 
 File {
-	owner   => root,
-	group   => root,
-	mode    => '0444',
-	ensure  => file,
+	owner  => root,
+	group  => root,
+	mode   => '0444',
+	ensure => file,
 }
 
 Exec {
@@ -26,7 +26,6 @@ node default {
 	include ssh
 	include debian-org
 	include monit
-	include apt-keys
 	include ntp
 	include ntpdate
 	include ssl
@@ -35,6 +34,10 @@ node default {
 	include nagios::client
 	include resolv
 
+	if $::hostname in [pasquini,tristano] {
+		include ganeti2
+	}
+
 	if $::hostname in [finzi,fano,fasch,field] {
 		include kfreebsd
 	}