Madhuvishy has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/393818 )
Change subject: Revert "public_dumps: Add puppet class to set up NFS for dumps
servers"
......................................................................
Revert "public_dumps: Add puppet class to set up NFS for dumps servers"
This reverts commit 7374a210104d27909d8fa20d50d096f1f17a14a6.
Change-Id: I63c2a29d7499008404c519cd1a73967546b4b1bc
---
M modules/profile/manifests/dumps/public_server.pp
D modules/public_dumps/files/nfs-common
D modules/public_dumps/files/nfs-kernel-server
D modules/public_dumps/manifests/nfs.pp
4 files changed, 1 insertion(+), 78 deletions(-)
Approvals:
Madhuvishy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/profile/manifests/dumps/public_server.pp
b/modules/profile/manifests/dumps/public_server.pp
index f0e95d9..f841c39 100644
--- a/modules/profile/manifests/dumps/public_server.pp
+++ b/modules/profile/manifests/dumps/public_server.pp
@@ -5,5 +5,5 @@
class profile::dumps::public_server {
class {'::public_dumps::server':}
- class {'::public_dumps::nfs':}
+ class {'::labstore':}
}
diff --git a/modules/public_dumps/files/nfs-common
b/modules/public_dumps/files/nfs-common
deleted file mode 100644
index cd91678..0000000
--- a/modules/public_dumps/files/nfs-common
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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".
-
-# Do you want to start the statd daemon? It is not needed for NFSv4.
-NEED_STATD=yes
-
-# Options for rpc.statd.
-# Should rpc.statd listen on a specific port? This is especially useful
-# 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 55659 --outgoing-port 44153'
-
-# Do you want to start the gssd daemon? It is required for Kerberos mounts.
-NEED_GSSD=
-NEED_LOCKD=no
diff --git a/modules/public_dumps/files/nfs-kernel-server
b/modules/public_dumps/files/nfs-kernel-server
deleted file mode 100644
index bfb4950..0000000
--- a/modules/public_dumps/files/nfs-kernel-server
+++ /dev/null
@@ -1,23 +0,0 @@
-# Number of servers to start up
-# To disable nfsv4 on the server, specify '--no-nfs-version 4' here
-
-# Best as max concurrently connected clients. We currently hover around
-# 250-280 connected clients as of 1/25/2016
-RPCNFSDCOUNT=192
-
-# Runtime priority of server (see nice(1))
-RPCNFSDPRIORITY=0
-
-# Options for rpc.mountd.
-# If you have a port-based firewall, you might want to set up
-# 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 --port 38466 --no-nfs-version 2,3'
-
-# 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".
-NEED_SVCGSSD=
-
-# Options for rpc.svcgssd.
-RPCSVCGSSDOPTS=
diff --git a/modules/public_dumps/manifests/nfs.pp
b/modules/public_dumps/manifests/nfs.pp
deleted file mode 100644
index 3586906..0000000
--- a/modules/public_dumps/manifests/nfs.pp
+++ /dev/null
@@ -1,37 +0,0 @@
-# Set up NFS Server for the public dumps servers
-# Firewall rules are managed separately through profile::wmcs::nfs::ferm
-
-class public_dumps::nfs {
-
- require_package('nfs-kernel-server', 'nfs-common', 'rpcbind')
-
- file { '/etc/default/nfs-common':
- ensure => present,
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/public_dumps/nfs-common',
- }
-
- file { '/etc/default/nfs-kernel-server':
- ensure => present,
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/public_dumps/nfs-kernel-server',
- }
-
- file { '/etc/modprobe.d/nfs-lockd.conf':
- ensure => present,
- owner => 'root',
- group => 'root',
- mode => '0644',
- content => 'options lockd nlm_udpport=32768 nlm_tcpport=32769',
- }
-
- # Manage state manually
- service { 'nfs-kernel-server':
- enable => false,
- }
-
-}
--
To view, visit https://gerrit.wikimedia.org/r/393818
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I63c2a29d7499008404c519cd1a73967546b4b1bc
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy <[email protected]>
Gerrit-Reviewer: Madhuvishy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
