Retire portman and pittar (RT#6121, RT#6135)

diff --git a/modules/autofs/manifests/init.pp b/modules/autofs/manifests/init.pp
index 8deae6d..115a1b1 100644 (file)
--- a/modules/autofs/manifests/init.pp
+++ b/modules/autofs/manifests/init.pp
@@ -1,6 +1,6 @@
 class autofs {
        case $::hostname {
-               pejacevic, piu-slave-bm-a, picconi, coccia, dillon, donizetti, ticharich, delfin, quantz, sor, lindsay, mekeel, pittar, pinel, tate: {
+               pejacevic, piu-slave-bm-a, picconi, coccia, dillon, donizetti, ticharich, delfin, quantz, sor, lindsay, mekeel, pinel, tate: {
                        include autofs::bytemark
                }
                lw07,lw08: {

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 4c0d047..effe0a8 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -80,11 +80,9 @@ nameinfo:
   picconi.debian.org: Maria Antonietta Picconi (September 23rd, 1869 - 1926)
   pieta.debian.org: Michielina della Pietà (fl. ca. 1700 - 1744)
   pinel.debian.org: Julie Pinel (fl. 1710 - 1737)
-  pittar.debian.org: Fanny Krumpholtz Pittar (1785 - 1815)
   pizzetti.debian.org: Ildebrando Pizzetti (20 September 1880 - 13 February 1968)
   plummer.debian.org: John Plummer (c. 1410 - c. 1483)
   porpora.debian.org: Niccolò (Antonio) Porpora (17 August 1686 - 3 March 1768)
-  portman.debian.org: Rachel Portman (11 December 1960 - )
   poulenc.debian.org: Francis Jean Marcel Poulenc (January 7th, 1899 - January 30th, 1963)
   powell.debian.org: Andrew Powell (b. April 18th, 1949)
   praetorius.debian.org: Hieronymus Praetorius (August 10th, 1560 - January 27th, 1629)

diff --git a/modules/multipath/templates/multipath-bm.conf.erb b/modules/multipath/templates/multipath-bm.conf.erb
index 6797bf2..9f946a3 100644 (file)
--- a/modules/multipath/templates/multipath-bm.conf.erb
+++ b/modules/multipath/templates/multipath-bm.conf.erb
@@ -204,14 +204,6 @@ multipaths {
                wwid    3600c0ff000d5ad34de57675401000000
                alias   picconi-lvm
        }
-       multipath {
-               wwid    3600c0ff000d5ad346501705501000000
-               alias   pittar
-       }
-       multipath {
-               wwid    3600c0ff000d5ad347c01705501000000
-               alias   pittar-lvm
-       }
        multipath {
                wwid    3600c0ff000d5ad345cee645401000000
                alias   piu-slave-bm-a
@@ -220,14 +212,6 @@ multipaths {
                wwid    3600c0ff000d5ad3465ee645401000000
                alias   piu-slave-bm-a-swap
        }
-       multipath {
-               wwid    3600c0ff000d5ad34c6ae6b5401000000
-               alias   portman
-       }
-       multipath {
-               wwid    3600c0ff000d5ad341e9d6b5401000000
-               alias   portman-lvm
-       }
        multipath {
                wwid    3600c0ff000d5ad34fa5d6a5401000000
                alias   quantz