replace a few bertali occurrences with ubc-bl2

diff --git a/hieradata/clusters/ganeti2.debian.org.yaml b/hieradata/clusters/ganeti2.debian.org.yaml
index 08e8da098bfd5c3c463880de8eb0f52b88a55dd1..a090db8fbd2cf8a020c17fffa97e0ab3f46e5992 100644 (file)
--- a/hieradata/clusters/ganeti2.debian.org.yaml
+++ b/hieradata/clusters/ganeti2.debian.org.yaml
@@ -2,7 +2,7 @@
 nodes:
   - 'tristano.debian.org'
   - 'pasquini.debian.org'
-  - 'bertali.debian.org'
+  - 'ubc-bl2.debian.org'
   - 'boito.debian.org'
   - 'ubc-bm8.debian.org'
   - 'luchesi.debian.org'

diff --git a/manifests/site.pp b/manifests/site.pp
index 0695176a96a7f48e711045ff3324056263cc060c..c1089a87d9ad4594659f6f71add68b0a27fae51b 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -48,7 +48,7 @@ node default {
                }
        }
 
-       if $::hostname in [pasquini,tristano,bertali,boito,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 [pasquini,tristano,ubc-bl2,boito,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] {
                include ganeti2
        }
 

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index e591413372d4380c737596bed0ada3abaa2607ca..1c9412726e13f420513db4e39237956de5332de6 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -12,7 +12,6 @@ nameinfo:
   beethoven.debian.org: Ludwig van Beethoven (December 16th, 1770 - March 26th, 1827)
   bendel.debian.org: Franz Bendel (March 23rd, 1833 - July 3rd, 1874)
   berlioz.debian.org: Hector Berlioz (December 11th, 1803 - March 8th, 1869)
-  bertali.debian.org: Antonio Bertali (March 1605 - 17 April 1669)
   binet.debian.org: Jocelyne Binet (September 27th, 1923 - January 13th, 1968)
   bizet.debian.org: Georges Bizet, (October 25th, 1838 - June 3rd, 1875)
   boiti.debian.org: Arrigo Boito (February 24th, 1842 - June 10th, 1918)

diff --git a/modules/lvm/manifests/init.pp b/modules/lvm/manifests/init.pp
index 94d0b2859a70ae924cfd9c2c822d64546b7ae6f1..cfa9e0f085d23983f953bf136e6ee5e4e9130d0a 100644 (file)
--- a/modules/lvm/manifests/init.pp
+++ b/modules/lvm/manifests/init.pp
@@ -3,7 +3,7 @@ class lvm {
                ubc-bl8,luchesi: {
                        $conffile = 'lvm-ubc-ganeti.conf'
                }
-               tristano,pasquini,bertali,boito: {
+               tristano,pasquini,ubc-bl2,boito: {
                        $conffile = 'lvm-ubc-ganeti-p410.conf'
                }
                csail-node01,csail-node02: {

diff --git a/modules/multipath/manifests/init.pp b/modules/multipath/manifests/init.pp
index 40002caf711a5f6210681123a271f64d9df76174..b953e432f815648f45b732984bcea3624a60fe82 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,pasquini,tristano,bertali,boito: {
+               ubc-bl8,luchesi,pasquini,tristano,ubc-bl2,boito: {
                        $conffile = 'multipath-ubc-ganeti.conf'
                }
                default: {

diff --git a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
index 8edfe7de6e028f2b681b86c86d15528e7ea86ac9..f89e732de98d0f866f8a6b4cc9cbc6f335d3d65d 100644 (file)
--- a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
+++ b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
@@ -25,7 +25,7 @@ blacklist {
         devnode "^hd[a-z][[0-9]*]"
         devnode "^vd[a-z]"
         devnode "^cciss!c[0-9]d[0-9]*[p[0-9]*]"
-<%- if %w{pasquini tristano boito bertali}.include?(hostname) then -%>
+<%- if %w{pasquini tristano boito ubc-bl2}.include?(hostname) then -%>
         devnode "^sda[0-9]*$"
 <%- end -%>
         device {