projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'debianmirrorrole'
[mirror/dsa-puppet.git]
/
modules
/
multipath
/
templates
/
multipath-bm.conf.erb
diff --git
a/modules/multipath/templates/multipath-bm.conf.erb
b/modules/multipath/templates/multipath-bm.conf.erb
index
803ce98
..
dbebcca
100644
(file)
--- a/
modules/multipath/templates/multipath-bm.conf.erb
+++ b/
modules/multipath/templates/multipath-bm.conf.erb
@@
-14,19
+14,15
@@
blacklist_exceptions {
multipaths {
multipath {
wwid 3600c0ff000d5ad34d7d8fa5501000000
multipaths {
multipath {
wwid 3600c0ff000d5ad34d7d8fa5501000000
- alias backuphost
+ alias
OLD-
backuphost
}
multipath {
}
multipath {
- wwid 3600c0ff000d
838e2e7d8fa55
01000000
- alias backuphost
-lvm
+ wwid 3600c0ff000d
5ad3406de855d
01000000
+ alias backuphost
2
}
multipath {
}
multipath {
- wwid 3600c0ff000d5ad346d96635401000000
- alias barriere
- }
- multipath {
- wwid 3600c0ff000d5ad34e88c635401000000
- alias barriere-lvm
+ wwid 3600c0ff000d838e2e7d8fa5501000000
+ alias backuphost-lvm
}
multipath {
wwid 3600c0ff000d5ad344455675401000000
}
multipath {
wwid 3600c0ff000d5ad344455675401000000
@@
-66,11
+62,11
@@
multipaths {
}
multipath {
wwid 3600c0ff000d5ad3421c3635401000000
}
multipath {
wwid 3600c0ff000d5ad3421c3635401000000
- alias dinis
+ alias
OLD-
dinis
}
multipath {
wwid 3600c0ff000d5ad34dc17115501000000
}
multipath {
wwid 3600c0ff000d5ad34dc17115501000000
- alias dinis-lvm
+ alias
OLD-
dinis-lvm
}
multipath {
wwid 3600c0ff000d5ad34f501655401000000
}
multipath {
wwid 3600c0ff000d5ad34f501655401000000
@@
-98,19
+94,11
@@
multipaths {
}
multipath {
wwid 3600c0ff000d5ad34c76a635401000000
}
multipath {
wwid 3600c0ff000d5ad34c76a635401000000
- alias lindsay
+ alias
OLD-
lindsay
}
multipath {
wwid 3600c0ff000d5ad34e86a635401000000
}
multipath {
wwid 3600c0ff000d5ad34e86a635401000000
- alias lindsay-srv
- }
- multipath {
- wwid 3600c0ff000d83a70921c115701000000
- alias manziarly
- }
- multipath {
- wwid 3600c0ff000d83a709d1c115701000000
- alias manziarly-lvm
+ alias OLD-lindsay-srv
}
multipath {
wwid 3600c0ff000d5ad34f1f56f5501000000
}
multipath {
wwid 3600c0ff000d5ad34f1f56f5501000000
@@
-150,23
+138,15
@@
multipaths {
}
multipath {
wwid 3600c0ff000d5ad343c439d5501000000
}
multipath {
wwid 3600c0ff000d5ad343c439d5501000000
- alias pinel
+ alias
OLD-
pinel
}
multipath {
wwid 3600c0ff000d5ad345c439d5501000000
}
multipath {
wwid 3600c0ff000d5ad345c439d5501000000
- alias pinel-lvm
+ alias
OLD-
pinel-lvm
}
multipath {
wwid 3600c0ff000d5ad34e3b4645401000000
}
multipath {
wwid 3600c0ff000d5ad34e3b4645401000000
- alias philp
- }
- multipath {
- wwid 3600c0ff000d5ad348f67675401000000
- alias OLD-picconi
- }
- multipath {
- wwid 3600c0ff000d5ad34de57675401000000
- alias OLD-picconi-lvm
+ alias OLD-philp
}
multipath {
wwid 3600c0ff000d83a709ddc705801000000
}
multipath {
wwid 3600c0ff000d83a709ddc705801000000
@@
-210,11
+190,11
@@
multipaths {
}
multipath {
wwid 3600c0ff000d5ad343fe03d5601000000
}
multipath {
wwid 3600c0ff000d5ad343fe03d5601000000
- alias rusca
+ alias
OLD-
rusca
}
multipath {
wwid 3600c0ff000d75b5869e03d5601000000
}
multipath {
wwid 3600c0ff000d75b5869e03d5601000000
- alias rusca-lvm
+ alias
OLD-
rusca-lvm
}
multipath {
wwid 3600c0ff000d5ad34b260685401000000
}
multipath {
wwid 3600c0ff000d5ad34b260685401000000
@@
-248,12
+228,4
@@
multipaths {
wwid 3600c0ff000d5ad34169d6b5401000000
alias ticharich-lvm
}
wwid 3600c0ff000d5ad34169d6b5401000000
alias ticharich-lvm
}
- multipath {
- wwid 3600c0ff000d5ad3463e4645401000000
- alias wuiet
- }
- multipath {
- wwid 3600c0ff000d5ad340ad9635401000000
- alias wuiet-lvm
- }
}
}