[MediaWiki-commits] [Gerrit] operations/puppet[production]: Move nfs and directory setup for dumpsdata hosts into dumps ...
ArielGlenn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/378701 )
Change subject: Move nfs and directory setup for dumpsdata hosts into dumps
module
..
Move nfs and directory setup for dumpsdata hosts into dumps module
Best for all dumps-related manifests to be in one module to the
extent possible.
Bug: T175606
Change-Id: I5d9acb5b6059bcb9fdf5d6440159123ae8c9b7d7
---
M manifests/site.pp
M modules/dataset/manifests/nfs.pp
A modules/dumps/manifests/generation/client/nfs.pp
R modules/dumps/manifests/generation/server/dirs.pp
R modules/dumps/manifests/generation/server/nfs.pp
R modules/dumps/templates/generation/default-nfs-common.erb
R modules/dumps/templates/generation/default-nfs-kernel-server.erb
R modules/dumps/templates/generation/nfs_exports.erb
R modules/profile/manifests/dumps/generation/server.pp
M modules/profile/manifests/dumps/nfs_server.pp
A modules/role/manifests/dumps/generation/server.pp
D modules/role/manifests/dumpsdata.pp
12 files changed, 58 insertions(+), 29 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index c7662d9..9b9c742 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -778,7 +778,7 @@
}
node /^dumpsdata100[12].eqiad.wmnet$/ {
-role(dumpsdata)
+role(dumps::generation::server)
}
node 'eeden.wikimedia.org' {
diff --git a/modules/dataset/manifests/nfs.pp b/modules/dataset/manifests/nfs.pp
index 9d01d1e..4814ad7 100644
--- a/modules/dataset/manifests/nfs.pp
+++ b/modules/dataset/manifests/nfs.pp
@@ -47,11 +47,6 @@
require => Package['nfs-kernel-server'],
}
-monitoring::service { 'nfs':
-description => 'NFS',
-check_command => 'check_tcp!2049',
-}
-
kmod::options { 'lockd':
options => 'nlm_udpport=32768 nlm_tcpport=32769',
}
diff --git a/modules/dumps/manifests/generation/client/nfs.pp
b/modules/dumps/manifests/generation/client/nfs.pp
new file mode 100644
index 000..7f2ea1b
--- /dev/null
+++ b/modules/dumps/manifests/generation/client/nfs.pp
@@ -0,0 +1,22 @@
+class dumps::generation::client::nfs {
+require_package('nfs-common')
+
+file { [ '/mnt/dumpsdata' ]:
+ensure => 'directory',
+}
+
+$dumpsdataserver = $::site ? {
+'eqiad' => 'dumpsdata1001.eqiad.wmnet',
+default => 'dumpsdata1001.eqiad.wmnet',
+}
+
+mount { '/mnt/dumpsdata':
+ensure => 'mounted',
+device => "${dumpsdataserver}:/data",
+fstype => 'nfs',
+name => '/mnt/dumpsdata',
+options => 'bg,hard,tcp,rsize=8192,wsize=8192,intr,nfsvers=3',
+require => File['/mnt/dumpsdata'],
+remounts => false,
+}
+}
diff --git a/modules/dumpsdirs/manifests/init.pp
b/modules/dumps/manifests/generation/server/dirs.pp
similarity index 97%
rename from modules/dumpsdirs/manifests/init.pp
rename to modules/dumps/manifests/generation/server/dirs.pp
index b09ba48..dfbb315 100644
--- a/modules/dumpsdirs/manifests/init.pp
+++ b/modules/dumps/manifests/generation/server/dirs.pp
@@ -1,4 +1,4 @@
-class dumpsdirs(
+class dumps::generation::server::dirs(
$user = undef,
$group = undef,
) {
diff --git a/modules/dumpsnfs/manifests/init.pp
b/modules/dumps/manifests/generation/server/nfs.pp
similarity index 80%
rename from modules/dumpsnfs/manifests/init.pp
rename to modules/dumps/manifests/generation/server/nfs.pp
index 45a2afd..e1a36e5 100644
--- a/modules/dumpsnfs/manifests/init.pp
+++ b/modules/dumps/manifests/generation/server/nfs.pp
@@ -1,4 +1,4 @@
-class dumpsnfs(
+class dumps::generation::server::nfs(
$clients = undef,
$statd_port = undef,
$statd_out = undef,
@@ -10,7 +10,7 @@
mode=> '0444',
owner => 'root',
group => 'root',
-content => template('dumpsnfs/nfs_exports.erb'),
+content => template('dumps/generation/nfs_exports.erb'),
require => Package['nfs-kernel-server'],
}
@@ -29,7 +29,7 @@
mode=> '0444',
owner => 'root',
group => 'root',
-content => template('dumpsnfs/default-nfs-common.erb'),
+content => template('dumps/generation/default-nfs-common.erb'),
require => Package['nfs-kernel-server'],
}
@@ -37,7 +37,7 @@
mode=> '0444',
owner => 'root',
group => 'root',
-content => template('dumpsnfs/default-nfs-kernel-server.erb'),
+content => template('dumps/generation/default-nfs-kernel-server.erb'),
require => Package['nfs-kernel-server'],
}
diff --git a/modules/dumpsnfs/templates/default-nfs-common.erb
b/modules/dumps/templates/generation/default-nfs-common.erb
similarity index 66%
rename from modules/dumpsnfs/templates/default-nfs-common.erb
rename to modules/dumps/templates/generation/default-nfs-common.erb
index
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Move nfs and directory setup for dumpsdata hosts into dumps ...
ArielGlenn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378701 )
Change subject: Move nfs and directory setup for dumpsdata hosts into dumps
module
..
Move nfs and directory setup for dumpsdata hosts into dumps module
Best for all dumps-related manifests to be in one module to the
extent possible.
Bug: T175606
Change-Id: I5d9acb5b6059bcb9fdf5d6440159123ae8c9b7d7
---
M manifests/site.pp
A modules/dumps/manifests/generation/client/nfs.pp
R modules/dumps/manifests/generation/server/dirs.pp
R modules/dumps/manifests/generation/server/nfs.pp
R modules/dumps/templates/generation/default-nfs-common.erb
R modules/dumps/templates/generation/default-nfs-kernel-server.erb
R modules/dumps/templates/generation/nfs_exports.erb
R modules/profile/manifests/dumps/generation/server.pp
M modules/profile/manifests/dumps/nfs_server.pp
A modules/role/manifests/dumps/generation/server.pp
D modules/role/manifests/dumpsdata.pp
11 files changed, 56 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/01/378701/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 72e06d3..a2c9be0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -785,7 +785,7 @@
}
node /^dumpsdata100[12].eqiad.wmnet$/ {
-role(dumpsdata)
+role(dumps::generation::server)
}
node 'eeden.wikimedia.org' {
diff --git a/modules/dumps/manifests/generation/client/nfs.pp
b/modules/dumps/manifests/generation/client/nfs.pp
new file mode 100644
index 000..7f2ea1b
--- /dev/null
+++ b/modules/dumps/manifests/generation/client/nfs.pp
@@ -0,0 +1,22 @@
+class dumps::generation::client::nfs {
+require_package('nfs-common')
+
+file { [ '/mnt/dumpsdata' ]:
+ensure => 'directory',
+}
+
+$dumpsdataserver = $::site ? {
+'eqiad' => 'dumpsdata1001.eqiad.wmnet',
+default => 'dumpsdata1001.eqiad.wmnet',
+}
+
+mount { '/mnt/dumpsdata':
+ensure => 'mounted',
+device => "${dumpsdataserver}:/data",
+fstype => 'nfs',
+name => '/mnt/dumpsdata',
+options => 'bg,hard,tcp,rsize=8192,wsize=8192,intr,nfsvers=3',
+require => File['/mnt/dumpsdata'],
+remounts => false,
+}
+}
diff --git a/modules/dumpsdirs/manifests/init.pp
b/modules/dumps/manifests/generation/server/dirs.pp
similarity index 100%
rename from modules/dumpsdirs/manifests/init.pp
rename to modules/dumps/manifests/generation/server/dirs.pp
diff --git a/modules/dumpsnfs/manifests/init.pp
b/modules/dumps/manifests/generation/server/nfs.pp
similarity index 82%
rename from modules/dumpsnfs/manifests/init.pp
rename to modules/dumps/manifests/generation/server/nfs.pp
index 45a2afd..32ff18f 100644
--- a/modules/dumpsnfs/manifests/init.pp
+++ b/modules/dumps/manifests/generation/server/nfs.pp
@@ -10,7 +10,7 @@
mode=> '0444',
owner => 'root',
group => 'root',
-content => template('dumpsnfs/nfs_exports.erb'),
+content => template('dumps/generation/nfs_exports.erb'),
require => Package['nfs-kernel-server'],
}
@@ -29,7 +29,7 @@
mode=> '0444',
owner => 'root',
group => 'root',
-content => template('dumpsnfs/default-nfs-common.erb'),
+content => template('dumps/generation/default-nfs-common.erb'),
require => Package['nfs-kernel-server'],
}
@@ -37,7 +37,7 @@
mode=> '0444',
owner => 'root',
group => 'root',
-content => template('dumpsnfs/default-nfs-kernel-server.erb'),
+content => template('dumps/generation/default-nfs-kernel-server.erb'),
require => Package['nfs-kernel-server'],
}
diff --git a/modules/dumpsnfs/templates/default-nfs-common.erb
b/modules/dumps/templates/generation/default-nfs-common.erb
similarity index 66%
rename from modules/dumpsnfs/templates/default-nfs-common.erb
rename to modules/dumps/templates/generation/default-nfs-common.erb
index b70a87a..b140fd2 100644
--- a/modules/dumpsnfs/templates/default-nfs-common.erb
+++ b/modules/dumps/templates/generation/default-nfs-common.erb
@@ -1,3 +1,9 @@
+##
+# THIS FILE IS MANAGED BY PUPPET
+#
+# Source: dumps/templates/generation/default-nfs-common.erb
+##
+
# If you do not set values for the NEED_ options, they will be attempted
# autodetected; this should be sufficient for most people. Valid alternatives
# for the NEED_ options are "yes" and "no".
@@ -10,7 +16,7 @@
# when you have a port-based firewall. To use a fixed port, set this
# this variable to a statd argument like: "--port 4000 --outgoing-port 4001".
# For more information, see rpc.statd(8) or
http://wiki.debian.org/SecuringNFS
-STATDOPTS="--port <%= scope.lookupvar('::dumpsnfs::statd_port') -%>
--outgoing-port <%=
