ArielGlenn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/400231 )
Change subject: move dumps nfs server name into hiera param for worker profile
......................................................................
move dumps nfs server name into hiera param for worker profile
also permit configurations with no external nfs server
(useful in deployment-prep)
Change-Id: I36b0c9b08ae0d8e0924e07dcb4a2dcf68867389f
---
M hieradata/common.yaml
M modules/profile/manifests/dumps/generation/worker/common.pp
M modules/snapshot/manifests/dumps/nfsmount.pp
3 files changed, 13 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/31/400231/1
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index f55e552..255de2f 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -350,6 +350,7 @@
external:
- odysseus.ip6.fi.muni.cz
- poincare.acc.umu.se
+dumps:nfs_server: dumpsdata1001.eqiad.wmnet
# Schemas names that match this regex
# will not be produced to the eventlogging-valid-mixed
diff --git a/modules/profile/manifests/dumps/generation/worker/common.pp
b/modules/profile/manifests/dumps/generation/worker/common.pp
index f26eb30..dbb09cd 100644
--- a/modules/profile/manifests/dumps/generation/worker/common.pp
+++ b/modules/profile/manifests/dumps/generation/worker/common.pp
@@ -1,4 +1,5 @@
class profile::dumps::generation::worker::common(
+ $nfs_server = hiera('dumps::nfs_server')
) {
# mw packages and dependencies
require ::profile::mediawiki::scap_proxy
@@ -11,7 +12,7 @@
snapshot::dumps::nfsmount { 'dumpsdatamount':
mountpoint => $xmldumpsmount,
- server => 'dumpsdata1001.eqiad.wmnet',
+ server => $nfs_server,
}
# dataset server config files,
# stages files, dblists, html templates
diff --git a/modules/snapshot/manifests/dumps/nfsmount.pp
b/modules/snapshot/manifests/dumps/nfsmount.pp
index 94f76a8..bbb1765 100644
--- a/modules/snapshot/manifests/dumps/nfsmount.pp
+++ b/modules/snapshot/manifests/dumps/nfsmount.pp
@@ -8,13 +8,15 @@
ensure => 'directory',
}
- mount { $mountpoint:
- ensure => 'mounted',
- device => "${server}:/data",
- fstype => 'nfs',
- name => $mountpoint,
- options => 'bg,hard,tcp,rsize=8192,wsize=8192,intr,nfsvers=3',
- require => File[$mountpoint],
- remounts => false,
+ if ($server != undef) {
+ mount { $mountpoint:
+ ensure => 'mounted',
+ device => "${server}:/data",
+ fstype => 'nfs',
+ name => $mountpoint,
+ options => 'bg,hard,tcp,rsize=8192,wsize=8192,intr,nfsvers=3',
+ require => File[$mountpoint],
+ remounts => false,
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/400231
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I36b0c9b08ae0d8e0924e07dcb4a2dcf68867389f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
