coren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/203864
Change subject: Labs: Remove idmap dependency on instances
......................................................................
Labs: Remove idmap dependency on instances
To be applied once no instances use it.
Bug: T95555
Change-Id: Ie71d5aab13335a9b27d9a2c7cc20f4926995ebde
---
D files/nfs/idmapd.conf
M files/nfs/nfs-common
M manifests/role/labs.pp
3 files changed, 4 insertions(+), 42 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/64/203864/1
diff --git a/files/nfs/idmapd.conf b/files/nfs/idmapd.conf
deleted file mode 100644
index 88a7167..0000000
--- a/files/nfs/idmapd.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-##
-## THIS FILE IS MANAGED BY PUPPET
-## files/nfs/idmapd.conf
-## managed by role::labs::instance
-##
-
-[General]
-Verbosity = 0
-Pipefs-Directory = /run/rpc_pipefs
-domain = wmflabs
-
-[Mapping]
-Nobody-User = nobody
-Nobody-Group = nogroup
diff --git a/files/nfs/nfs-common b/files/nfs/nfs-common
index 37ddad1..893714a 100644
--- a/files/nfs/nfs-common
+++ b/files/nfs/nfs-common
@@ -13,7 +13,7 @@
STATDOPTS="--port 32765 --outgoing-port 32766"
# Do you want to start the idmapd daemon? It is only needed for NFSv4.
-NEED_IDMAPD=
+NEED_IDMAPD=no
# Do you want to start the gssd daemon? It is required for Kerberos mounts.
NEED_GSSD=
diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index f63a2a6..98366b1 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -64,9 +64,7 @@
file { '/data/project':
ensure => directory,
- require => File['/data',
- '/etc/idmapd.conf'
- ],
+ require => File['/data'],
}
mount { '/data/project':
@@ -80,9 +78,7 @@
file { '/data/scratch':
ensure => directory,
- require => File['/data',
- '/etc/idmapd.conf'
- ],
+ require => File['/data'],
}
mount { '/data/scratch':
ensure => mounted,
@@ -131,28 +127,8 @@
content => "options nfs nfs4_disable_idmapping=1\n",
}
- # Actually disabling idmapd and ensure => absent on the config
- # files needs to wait for T95556 to ensure no running instance
- # gets a broken idmapd.
-
- if $::operatingsystem == 'Debian' {
- service { 'nfs-common':
- ensure => running,
- subscribe => File['/etc/idmapd.conf', '/etc/default/nfs-common'],
- }
- } else {
- service { 'idmapd':
- ensure => running,
- subscribe => File['/etc/idmapd.conf'],
- }
- }
-
file { '/etc/idmapd.conf':
- ensure => present,
- owner => 'root',
- group => 'root',
- mode => '0444',
- source => 'puppet:///files/nfs/idmapd.conf',
+ ensure => absent,
}
# In production, we try to be punctilious about having Puppet manage
--
To view, visit https://gerrit.wikimedia.org/r/203864
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie71d5aab13335a9b27d9a2c7cc20f4926995ebde
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
