luchesi -> ubc-bl4

diff --git a/hieradata/clusters/ganeti2.debian.org.yaml b/hieradata/clusters/ganeti2.debian.org.yaml
index 1898af4..5dc7872 100644 (file)
--- a/hieradata/clusters/ganeti2.debian.org.yaml
+++ b/hieradata/clusters/ganeti2.debian.org.yaml
@@ -5,4 +5,4 @@ nodes:
   - 'ubc-bl2.debian.org'
   - 'ubc-bl6.debian.org'
   - 'ubc-bm8.debian.org'
-  - 'luchesi.debian.org'
+  - 'ubc-bl4.debian.org'

diff --git a/manifests/site.pp b/manifests/site.pp
index 8af2f91..bce16e6 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -48,7 +48,7 @@ node default {
                }
        }
 
-       if $::hostname in [ubc-bl7,ubc-bl3,ubc-bl2,ubc-bl6,ubc-bl8,luchesi,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,csail-node01,csail-node02,grnet-node01,grnet-node02] {
+       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,csail-node01,csail-node02,grnet-node01,grnet-node02] {
                include ganeti2
        }
 

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 00261ad..e7192e3 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -64,7 +64,6 @@ nameinfo:
   lindsay.debian.org: Maria Lindsay Bliss (May 15th, 1827 - April 3rd, 1898)
   locke.debian.org: Matthew Locke (ca. 1621 - 1677)
   lotti.debian.org: Antonio Lotti (ca. 1667 - January 5th, 1740)
-  luchesi.debian.org: Andrea Luca Luchesi (May 23rd, 1741 - March 21st, 1801)
   lully.debian.org: Jean-Baptiste de Lully (November 28th, 1632 - March 22nd, 1687)
   mailly.debian.org: Alphonse Jean Ernest Mailly (November 27th, 1833 - January 10th, 1918)
   mayer.debian.org: John Mayer (October 28th, 1930 - March 9th, 2004)

diff --git a/modules/lvm/manifests/init.pp b/modules/lvm/manifests/init.pp
index bae9aef..34663ae 100644 (file)
--- a/modules/lvm/manifests/init.pp
+++ b/modules/lvm/manifests/init.pp
@@ -1,6 +1,6 @@
 class lvm {
        case $::hostname {
-               ubc-bl8,luchesi: {
+               ubc-bl8,ubc-bl4: {
                        $conffile = 'lvm-ubc-ganeti.conf'
                }
                ubc-bl3,ubc-bl7,ubc-bl2,ubc-bl6: {

diff --git a/modules/multipath/manifests/init.pp b/modules/multipath/manifests/init.pp
index f9dc2c4..b983131 100644 (file)
--- a/modules/multipath/manifests/init.pp
+++ b/modules/multipath/manifests/init.pp
@@ -14,7 +14,7 @@ class multipath {
                bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl13,bm-bl14: {
                        $conffile = 'multipath-bm.conf'
                }
-               ubc-bl8,luchesi,ubc-bl7,ubc-bl3,ubc-bl2,ubc-bl6: {
+               ubc-bl8,ubc-bl4,ubc-bl7,ubc-bl3,ubc-bl2,ubc-bl6: {
                        $conffile = 'multipath-ubc-ganeti.conf'
                }
                default: {

diff --git a/modules/ntpdate/manifests/init.pp b/modules/ntpdate/manifests/init.pp
index de9c335..f6f0f9a 100644 (file)
--- a/modules/ntpdate/manifests/init.pp
+++ b/modules/ntpdate/manifests/init.pp
@@ -9,7 +9,7 @@ class ntpdate {
                }
 
                $ntpservers = $::hostname ? {
-                       default => ['czerny.debian.org', 'clementi.debian.org', 'bm-bl1.debian.org', 'bm-bl2.debian.org', 'ubc-bl8.debian.org', 'luchesi.debian.org']
+                       default => ['czerny.debian.org', 'clementi.debian.org', 'bm-bl1.debian.org', 'bm-bl2.debian.org', 'ubc-bl8.debian.org', 'ubc-bl4.debian.org']
                }
 
                file { '/etc/default/ntpdate':