ArielGlenn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/71980
Change subject: hosts that mount /data will do so from dataset host in same
datacenter
......................................................................
hosts that mount /data will do so from dataset host in same datacenter
Change-Id: I981910efd53c8776882e66d31f699188b752f8b4
---
M manifests/nfs.pp
1 file changed, 14 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/80/71980/1
diff --git a/manifests/nfs.pp b/manifests/nfs.pp
index 3434682..15ee8e6 100644
--- a/manifests/nfs.pp
+++ b/manifests/nfs.pp
@@ -233,19 +233,25 @@
class nfs::data {
include nfs::common
- file { [ "/mnt/data" ]:
+ file { [ '/mnt/data' ]:
ensure => directory;
}
+ $datasetserver = $site ? {
+ 'eqiad' => 'dataset1001.wikimedia.org',
+ 'pmtpa' => 'dataset2.wikimedia.org',
+ default => 'dataset2.wikimedia.org',
+ }
+
mount {
- "/mnt/data":
- device => "dataset2.wikimedia.org:/data",
- fstype => "nfs",
- name => "/mnt/data",
- options =>
"bg,hard,tcp,rsize=8192,wsize=8192,intr,nfsvers=3",
- require => File["/mnt/data"],
+ '/mnt/data':
+ device => "${datasetserver}:/data",
+ fstype => 'nfs',
+ name => '/mnt/data',
+ options =>
'bg,hard,tcp,rsize=8192,wsize=8192,intr,nfsvers=3',
+ require => File['/mnt/data'],
remounts => false,
- ensure => mounted;
+ ensure => mounted;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/71980
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I981910efd53c8776882e66d31f699188b752f8b4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <ar...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
