remove rossini and salieri

diff --git a/hieradata/clusters/ganeti2.debian.org.yaml b/hieradata/clusters/ganeti2.debian.org.yaml
index 2487733..77c8687 100644 (file)
--- a/hieradata/clusters/ganeti2.debian.org.yaml
+++ b/hieradata/clusters/ganeti2.debian.org.yaml
@@ -4,7 +4,5 @@ nodes:
   - 'pasquini.debian.org'
   - 'bertali.debian.org'
   - 'boito.debian.org'
-  - 'rossini.debian.org'
-  - 'salieri.debian.org'
   - 'dijkstra.debian.org'
   - 'luchesi.debian.org'

diff --git a/manifests/site.pp b/manifests/site.pp
index af09ec5..4d3309c 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -48,7 +48,7 @@ node default {
                }
        }
 
-       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,csail-node01,csail-node02,grnet-node01,grnet-node02] {
+       if $::hostname in [pasquini,tristano,bertali,boito,dijkstra,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 c657e14..7943f9e 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -105,9 +105,7 @@ nameinfo:
   ravel.debian.org: Joseph-Maurice Ravel (March 7th, 1875 - December 28th, 1937)
   reger.debian.org: Johann Baptist Joseph Maximilian Reger (March 19th, 1873 - May 11th, 1916)
   rietz.debian.org: August Wilhelm Julius Rietz (December 28th, 1812 - September 12th, 1877)
-  rossini.debian.org: Gioachino Rossini (February 29th, 1792 - November 13th, 1868)
   saens.debian.org: Charles-Camille Saint-Saëns  (October 9th, 1835 - December 16th, 1921)
-  salieri.debian.org: Antonio Salieri (August 18th, 1750 - May 7th, 1825)
   samosa.debian.org: The samosa is a stuffed pastry and a popular snack in South Asia, Southeast Asia, Central Asia, the Arabian Peninsula, throughout the Mediterranean (Greece), Southwest Asia, the Horn of Africa and North Africa.
   santoro.debian.org: Cláudio Santoro (November 23rd, 1919 - March 27th, 1989)
   schein.debian.org: Johann Hermann Schein (January 20th, 1586 - November 19th, 1630)

diff --git a/modules/lvm/manifests/init.pp b/modules/lvm/manifests/init.pp
index 953cef5..12684bd 100644 (file)
--- a/modules/lvm/manifests/init.pp
+++ b/modules/lvm/manifests/init.pp
@@ -1,6 +1,6 @@
 class lvm {
        case $::hostname {
-               dijkstra,luchesi,rossini,salieri: {
+               dijkstra,luchesi: {
                        $conffile = 'lvm-ubc-ganeti.conf'
                }
                tristano,pasquini,bertali,boito: {

diff --git a/modules/multipath/manifests/init.pp b/modules/multipath/manifests/init.pp
index 7b8aed3..6b73984 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'
                }
-               dijkstra,luchesi,rossini,salieri,pasquini,tristano,bertali: {
+               dijkstra,luchesi,pasquini,tristano,bertali: {
                        $conffile = 'multipath-ubc-ganeti.conf'
                }
                default: {