multipath config ubc

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 66236f4b135da63c0f63615480047dfd301d5fd2..61404a5c8f91099f9778b4c4a1d4611e1412c1b0 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -29,18 +29,23 @@ node default {
        include ntp
        include ntpdate
        include ssl
-       include motd
        include hardware
        include nagios::client
        include resolv
        include roles
+       include motd
        include unbound
        include bacula::client
+       include autofs
 
-       if $::hostname in [pasquini,tristano,bertali,boito,byrd,clementi,czerny] {
+       if $::hostname in [pasquini,tristano,bertali,boito,byrd,clementi,czerny,rossini,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 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] {
+               include multipath
+       }
+
        if $::hostname == 'dinis' {
                include bacula::director
        } else {
@@ -92,7 +97,7 @@ node default {
                include dacs
        }
 
-       if $::hostname in [beethoven,spohr,stabile,beach] {
+       if $::hostname in [beethoven,spohr,stabile,beach,glinka,milanollo] {
                include nfs-server
        }
 
@@ -108,7 +113,9 @@ node default {
                include portforwarder
        }
 
-       include samhain
+       if $::samhain {
+               include samhain
+       }
 
        if $::hostname in [chopin,geo3,soler,wieck] {
                include debian-org::radvd
@@ -122,7 +129,7 @@ node default {
                munin::check { 'spamassassin': }
        }
 
-        if $::hoster {
+       if $::hoster {
                if $::hoster in [ynic] {
                        include lldp
                }