Decommission ubc-bl*.debian.org

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 8e72e7d..80190d3 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -42,6 +42,9 @@ node default {
        include popcon
        include portforwarder
        include postgres
+       include haveged
+       include huge_mem
+       include tcp_bbr
 
        if $::lsbdistcodename == squeeze {
                include roles::udldap::client
@@ -52,26 +55,10 @@ node default {
                }
        }
 
-       if $::hostname in [ubc-bl7,ubc-bl3,ubc-bl2,ubc-bl6,ubc-bl8,ubc-bl4,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,csail-node01,csail-node02,grnet-node01,grnet-node02,ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10] {
+       if $::hostname in [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,csail-node01,csail-node02,grnet-node01,grnet-node02,ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10,conova-node01,conova-node02] {
                include ganeti2
        }
 
-       if $::hostname == 'dinis' {
-               include bacula::director
-       } else {
-               package { 'bacula-console':
-                       ensure => purged;
-               }
-
-               file { '/etc/bacula/bconsole.conf':
-                       ensure => absent;
-               }
-       }
-
-       if $::hostname == 'storace' {
-               include bacula::storage
-       }
-
        if $::kernel == 'Linux' {
                include linux
                include acpi
@@ -99,8 +86,8 @@ node default {
                include named::geodns
        }
 
-       if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] {
-               include nfs-server
+       if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov,sibelius] {
+               include nfs_server
        }
 
        if $::brokenhosts {