Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168959
Change subject: nfs::netapp::home backwards compatibility
......................................................................
nfs::netapp::home backwards compatibility
bast1001 used to mount /vol/home_pmtpa via the
nfs::netapp::home::othersite class. Stop using that class and add an
extra parameter to nfs::netapp::home class to optionally specify the
site to mount. Then apply it to bast1001
Change-Id: I7513dbb1a7a46fcc2ad84b3f85250b728760331f
---
M manifests/nfs.pp
M manifests/site.pp
2 files changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/59/168959/1
diff --git a/manifests/nfs.pp b/manifests/nfs.pp
index de8dfe3..dbf3d4e 100644
--- a/manifests/nfs.pp
+++ b/manifests/nfs.pp
@@ -86,7 +86,7 @@
$options = 'bg,intr'
}
-class nfs::netapp::home($ensure='mounted', $mountpoint='/home') {
+class nfs::netapp::home($ensure='mounted', $mountpoint='/home',
$mount_site=$::site) {
include common
file { $mountpoint:
@@ -96,7 +96,7 @@
mount { $mountpoint:
ensure => $ensure,
require => File[$mountpoint],
- device => "${nfs::netapp::common::device}:/vol/home_${::site}",
+ device => "${nfs::netapp::common::device}:/vol/home_${mount_site}",
fstype => 'nfs',
options => $nfs::netapp::common::options,
}
diff --git a/manifests/site.pp b/manifests/site.pp
index 8fd59d7..8260b6d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -353,9 +353,11 @@
include role::bastionhost
- include nfs::netapp::home::othersite
include dsh
include ssh::hostkeys-collect
+ class { 'nfs::netapp::home':
+ mount_site = 'pmtpa',
+ }
}
node 'bast2001.wikimedia.org' {
--
To view, visit https://gerrit.wikimedia.org/r/168959
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7513dbb1a7a46fcc2ad84b3f85250b728760331f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
