Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  Add philp
  Add philp multipath entry

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 3869524..1451196 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -91,6 +91,7 @@ nameinfo:
   pejacevic: Dora Pejačević (September 10, 1885 - March 5, 1923)
   pettersson.debian.org: Gustav Allan Pettersson (September 19th, 1911 - June 20th, 1980)
   picconi.debian.org: Maria Antonietta Picconi (September 23rd, 1869 - 1926)
+  philp.debian.org: Elizabeth Philp (1827 - November 26th, 1885)
   popov.debian.org: Gavriil Nikolayevich Popov (Гаврии́л Никола́евич Попо́в) (September 12th, 1904 - February 17th, 1972)
   porpora.debian.org: Niccolò (Antonio) Porpora (17 August 1686 - 3 March 1768)
   poulenc.debian.org: Francis Jean Marcel Poulenc (January 7, 1899 - January 30, 1963)

diff --git a/modules/multipath/files/multipath-bm.conf b/modules/multipath/files/multipath-bm.conf
index 3852375..65262a6 100644 (file)
--- a/modules/multipath/files/multipath-bm.conf
+++ b/modules/multipath/files/multipath-bm.conf
@@ -80,7 +80,6 @@ multipaths {
                wwid    3600c0ff000d5ad34104fd85101000000
                alias   coccia-srv
        }
-
        multipath {
                wwid    3600c0ff000d5ad348401f95101000000
                alias   backuphost
@@ -89,4 +88,8 @@ multipaths {
                wwid    3600c0ff000d5ad34d400f95101000000
                alias   backups
        }
+       multipath {
+               wwid    3600c0ff000d5ad34ae8e0a5201000000
+               alias   philp
+       }
 }