sigh, typo

[dsa-puppet.git] / manifests / site.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index f9c3c853e072b0eb312bc7205efb3bab8d59d608..4dc9fc99c161bea83db65e0dcea125c7db77799b 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -37,13 +37,19 @@ node default {
        include unbound
        include bacula::client
        include autofs
-
-       if $::hostname in [pasquini,tristano,bertali,boito,rossini,dijkstra,luchesi,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14] {
-               include ganeti2
+       include lvm
+       include multipath
+       if $::lsbdistcodename == squeeze {
+               include roles::udldap::client
+       } else {
+               include roles::pubsub::client
+               class { 'roles::udldap::client':
+                       ensure => absent
+               }
        }
 
-       if $::hostname in [bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14,rossini,luchesi,dijkstra] {
-               include multipath
+       if $::hostname in [pasquini,tristano,bertali,boito,rossini,salieri,dijkstra,luchesi,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14] {
+               include ganeti2
        }
 
        if $::hostname == 'dinis' {
@@ -58,7 +64,7 @@ node default {
                }
        }
 
-       if $::hostname == 'beethoven' {
+       if $::hostname == 'backuphost' {
                include bacula::storage
        }
 
@@ -87,17 +93,15 @@ node default {
                include apache2
        }
 
-       if $::hostname in [ravel,senfl,orff,draghi,diamond,rietz] {
-               include named::authoritative
-       } elsif $::hostname in [geo1,geo2,geo3] {
+       if $::hostname in [geo1,geo2,geo3] {
                include named::geodns
        }
 
-       if $::hostname in [diabelli,nono,spohr] {
+       if $::hostname in [diabelli,nono] {
                include dacs
        }
 
-       if $::hostname in [beethoven,spohr,stabile,beach,glinka,milanollo] {
+       if $::hostname in [stabile,beach,glinka,milanollo,rautavaara] {
                include nfs-server
        }