X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=bec319b45644ae51dc6308f6f62f91a650867c36;hb=39b1f47c9704e1f143714bec6800a26a27911572;hp=ce1ddaf681c208e6e42ce93a571927f08c00745c;hpb=6710ef26e1c124e536aef0cecd742fe27586ea63;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index ce1ddaf68..bec319b45 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,10 +1,8 @@
 Package {
-	noop    => true,
 	require => File['/etc/apt/apt.conf.d/local-recommends']
 }
 
 File {
-	noop   => true,
 	owner  => root,
 	group  => root,
 	mode   => '0444',
@@ -12,12 +10,10 @@ File {
 }
 
 Exec {
-	noop => true,
 	path => '/usr/bin:/usr/sbin:/bin:/sbin'
 }
 
 Service {
-	noop       => true,
 	hasrestart => true,
 	hasstatus  => true,
 }
@@ -30,7 +26,6 @@ node default {
 	include ssh
 	include debian-org
 	include monit
-	include apt-keys
 	include ntp
 	include ntpdate
 	include ssl
@@ -39,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
 	}