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 0000000..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 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 <%= scope.lookupvar('::dumpsnfs::statd_out') -%>"
+STATDOPTS="--port <%=
scope.lookupvar('::dumps::generation::server::nfs::statd_port') -%>
--outgoing-port <%=
scope.lookupvar('::dumps::generation::server::nfs::statd_out') -%>"
# Do you want to start the gssd daemon? It is required for Kerberos mounts.
NEED_GSSD=
diff --git a/modules/dumpsnfs/templates/default-nfs-kernel-server.erb
b/modules/dumps/templates/generation/default-nfs-kernel-server.erb
similarity index 71%
rename from modules/dumpsnfs/templates/default-nfs-kernel-server.erb
rename to modules/dumps/templates/generation/default-nfs-kernel-server.erb
index 0d35e8a..2d69862 100644
--- a/modules/dumpsnfs/templates/default-nfs-kernel-server.erb
+++ b/modules/dumps/templates/generation/default-nfs-kernel-server.erb
@@ -1,3 +1,9 @@
+##################################
+# THIS FILE IS MANAGED BY PUPPET
+#
+# Source: dumps/templates/generation/default-nfs-kernel-server.erb
+##################################
+
# Number of servers to start up
# To disable nfsv4 on the server, specify '--no-nfs-version 4' here
RPCNFSDCOUNT=8
@@ -10,7 +16,7 @@
# a fixed port here using the --port option. For more information,
# see rpc.mountd(8) or http://wiki.debian.org/SecuringNFS
# To disable NFSv4 on the server, specify '--no-nfs-version 4' here
-RPCMOUNTDOPTS="--manage-gids -p <%= scope.lookupvar('::dumpsnfs::mountd_port')
-%>"
+RPCMOUNTDOPTS="--manage-gids -p <%=
scope.lookupvar('::dumps::generation::server::nfs::mountd_port') -%>"
# Do you want to start the svcgssd daemon? It is only required for Kerberos
# exports. Valid alternatives are "yes" and "no"; the default is "no".
diff --git a/modules/dumpsnfs/templates/nfs_exports.erb
b/modules/dumps/templates/generation/nfs_exports.erb
similarity index 90%
rename from modules/dumpsnfs/templates/nfs_exports.erb
rename to modules/dumps/templates/generation/nfs_exports.erb
index 984f6f9..1508ed3 100644
--- a/modules/dumpsnfs/templates/nfs_exports.erb
+++ b/modules/dumps/templates/generation/nfs_exports.erb
@@ -2,8 +2,7 @@
# to NFS clients. See exports(5).
#
# THIS FILE IS MANAGED BY PUPPET
-#
-# Source: dumpsnfs/templates/nfs_exports.erb
+# Source: dumps/templates/generation/nfs_exports.erb
#
# Example for NFSv2 and NFSv3:
# /srv/homes hostname1(rw,sync,no_subtree_check)
hostname2(ro,sync,no_subtree_check)
diff --git a/modules/profile/manifests/dumpsdata.pp
b/modules/profile/manifests/dumps/generation/server.pp
similarity index 87%
rename from modules/profile/manifests/dumpsdata.pp
rename to modules/profile/manifests/dumps/generation/server.pp
index ed6c8dd..d355669 100644
--- a/modules/profile/manifests/dumpsdata.pp
+++ b/modules/profile/manifests/dumps/generation/server.pp
@@ -1,4 +1,4 @@
-class profile::dumpsdata(
+class profile::dumps::generation::server(
$clients = hiera('dumps_clients_snapshots'),
) {
$mountd_port = '32767'
@@ -8,7 +8,7 @@
$lockd_udp = '32768'
$lockd_tcp = '32769'
- class { '::dumpsnfs':
+ class { '::dumps::generation::server::nfs':
clients => $clients,
statd_port => $statd_port,
statd_out => $statd_out,
@@ -55,14 +55,9 @@
srange => '$PRODUCTION_NETWORKS',
}
- monitoring::service { 'nfs':
- description => 'NFS',
- check_command => 'check_tcp!2049',
- }
-
class { '::dumpsuser': }
- class { '::dumpsdirs':
+ class { '::dumps::generation::server::dirs':
user => $dumpsuser::user,
group => $dumpsuser::group,
}
diff --git a/modules/profile/manifests/dumps/nfs_server.pp
b/modules/profile/manifests/dumps/nfs_server.pp
index 4c72c9c..606d904 100644
--- a/modules/profile/manifests/dumps/nfs_server.pp
+++ b/modules/profile/manifests/dumps/nfs_server.pp
@@ -1,4 +1,9 @@
class profile::dumps::nfs_server {
+ monitoring::service { 'nfs':
+ description => 'NFS',
+ check_command => 'check_tcp!2049',
+ }
+
ferm::service { 'dumps_nfs':
proto => 'tcp',
port => '2049',
diff --git a/modules/role/manifests/dumps/generation/server.pp
b/modules/role/manifests/dumps/generation/server.pp
new file mode 100644
index 0000000..6af93a7
--- /dev/null
+++ b/modules/role/manifests/dumps/generation/server.pp
@@ -0,0 +1,7 @@
+class role::dumps::generation::server {
+ system::role { 'dumps::generation::server': description => 'NFS server of
dumps generation filesystem to dumps producer hosts' }
+
+ include ::standard
+ include ::profile::dumps::generation::server
+ include ::profile::dumps::nfs_server
+}
diff --git a/modules/role/manifests/dumpsdata.pp
b/modules/role/manifests/dumpsdata.pp
deleted file mode 100644
index cb2b998..0000000
--- a/modules/role/manifests/dumpsdata.pp
+++ /dev/null
@@ -1,6 +0,0 @@
-class role::dumpsdata {
- system::role { 'dumpsdata': description => 'NFS server of dumps data to
dumps producer hosts' }
-
- include ::standard
- include ::profile::dumpsdata
-}
--
To view, visit https://gerrit.wikimedia.org/r/378701
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5d9acb5b6059bcb9fdf5d6440159123ae8c9b7d7
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
