pasquini -> ubc-bl7

diff --git a/hieradata/clusters/ganeti2.debian.org.yaml b/hieradata/clusters/ganeti2.debian.org.yaml
index 64bb0f7fd86f582ba08900641346f4e6681f398c..84c655f18f1c1f2ef637f66c752dc43dfc778585 100644 (file)
--- a/hieradata/clusters/ganeti2.debian.org.yaml
+++ b/hieradata/clusters/ganeti2.debian.org.yaml
@@ -1,7 +1,7 @@
 ---
 nodes:
   - 'ubc-bl3.debian.org'
-  - 'pasquini.debian.org'
+  - 'ubc-bl7.debian.org'
   - 'ubc-bl2.debian.org'
   - 'boito.debian.org'
   - 'ubc-bm8.debian.org'

diff --git a/manifests/site.pp b/manifests/site.pp
index f87b9be85910f8faa5085997a384ee41801ceb16..cefc3f1b94e1bb934ac5995ca6000740b99449cc 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -48,7 +48,7 @@ node default {
                }
        }
 
-       if $::hostname in [pasquini,ubc-bl3,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] {
+       if $::hostname in [ubc-bl7,ubc-bl3,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 a653c56f809f70e9d8d422aa418b15ee8120ba2b..d5e54b9d5ef816e0b446b5b139ce6049771d749d 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -82,7 +82,6 @@ nameinfo:
   paradis.debian.org: Maria Theresia Paradis (May 15th, 1759 - February 1st, 1824)
   parry.debian.org: Sir Charles Hubert Hastings Parry, 1st Baronet (February 27th, 1848 - October 7th, 1918)
   partch.debian.org: Harry Partch (June 24th, 1901 - September 3rd, 1974)
-  pasquini.debian.org: Bernardo Pasquini (December 7th, 1637 - November 22nd, 1710)
   pejacevic: Dora Pejačević (September 10th, 1885 - March 5th, 1923)
   petrova.debian.org: Mara Petrova (May 15th, 1921 - June 7th. 1997)
   pettersson.debian.org: Gustav Allan Pettersson (September 19th, 1911 - June 20th, 1980)

diff --git a/modules/lvm/manifests/init.pp b/modules/lvm/manifests/init.pp
index 7ce0c8c10a3ccf7910c285e848a19d40c37602d1..b373061d134752422df9448543d4378629b7d608 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'
                }
-               ubc-bl3,pasquini,ubc-bl2,boito: {
+               ubc-bl3,ubc-bl7,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 90b8fbb35f9e4bf3e0be93b4fea5d5b36504b958..bc3be2d68f083975f8e48f8e8c1aaa988d337020 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,ubc-bl3,ubc-bl2,boito: {
+               ubc-bl8,luchesi,ubc-bl7,ubc-bl3,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 4327b9a0dc027302b096ec714df12c665bfdc24b..24218cade439d0a24c942856b27da5316097e728 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 ubc-bl3 boito ubc-bl2}.include?(hostname) then -%>
+<%- if %w{ubc-bl7 ubc-bl3 boito ubc-bl2}.include?(hostname) then -%>
         devnode "^sda[0-9]*$"
 <%- end -%>
         device {