Support adding dns snippets on orff from other hosts

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 86bec7d2333a5166bec32b7ba0a54c9165bc889c..ace4f63b3a37b8a98733a6b43de1d17915c276ff 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -37,14 +37,13 @@ node default {
        include unbound
        include bacula::client
        include autofs
+       include lvm
+       include multipath
 
-       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] {
+       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 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
@@ -92,6 +91,9 @@ node default {
        } elsif $::hostname in [geo1,geo2,geo3] {
                include named::geodns
        }
+       if $::hostname in [orff] {
+               include dnsextras::entries
+       }
 
        if $::hostname in [diabelli,nono,spohr] {
                include dacs