Hello Rush, jenkins-bot,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/391906
to review the following change.
Change subject: Revert "nfsmount: Add temporary exception to the
block-for-export check"
......................................................................
Revert "nfsmount: Add temporary exception to the block-for-export check"
This reverts commit bf8557d4450b1cecf33577c5cea743b5be1d74dd.
Change-Id: Ib4ce462fcdd0b9a1fbafa47eb3d67b82ec7052a9
---
M modules/labstore/manifests/nfs_mount.pp
1 file changed, 15 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/06/391906/1
diff --git a/modules/labstore/manifests/nfs_mount.pp
b/modules/labstore/manifests/nfs_mount.pp
index 5ee1bad..c0ad900 100644
--- a/modules/labstore/manifests/nfs_mount.pp
+++ b/modules/labstore/manifests/nfs_mount.pp
@@ -130,30 +130,24 @@
if ($ensure == 'present') and mount_nfs_volume($project, $mount_name) {
- # This project!=testlabs check is a super temporary check put in place
to
- # test new VM images that include alternative functionality to block
until
- # all the mounts are available, that would deprecate the following
showmount
- # based mechanism if it works correctly.
- # TODO: Revert this check after testing (T174590)
- if ($project != 'testlabs') {
- if $block {
- if !defined(File['/usr/local/sbin/block-for-export']) {
- # This script will block until the NFS volume is available
- file { '/usr/local/sbin/block-for-export':
- ensure => present,
- owner => 'root',
- group => 'root',
- mode => '0555',
- source =>
'puppet:///modules/labstore/block-for-export',
- }
- }
- exec { "block-for-nfs-${name}":
- command => "/usr/local/sbin/block-for-export ${server}
project/${project} ${block_timeout}",
- require => [File['/etc/modprobe.d/nfs-no-idmap.conf'],
File['/usr/local/sbin/block-for-export']],
- unless => "/bin/mountpoint -q ${mount_path}",
+ if $block {
+ if !defined(File['/usr/local/sbin/block-for-export']) {
+ # This script will block until the NFS volume is available
+ file { '/usr/local/sbin/block-for-export':
+ ensure => present,
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => 'puppet:///modules/labstore/block-for-export',
}
}
+ exec { "block-for-nfs-${name}":
+ command => "/usr/local/sbin/block-for-export ${server}
project/${project} ${block_timeout}",
+ require => [File['/etc/modprobe.d/nfs-no-idmap.conf'],
File['/usr/local/sbin/block-for-export']],
+ unless => "/bin/mountpoint -q ${mount_path}",
+ }
}
+
# 'present' is meant to manage only the status of entries in /etc/fstab
# a notable exception to this is in the case of an entry managed as
'present'
# puppet will attempt to remount that entry when options change /but/
only
--
To view, visit https://gerrit.wikimedia.org/r/391906
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4ce462fcdd0b9a1fbafa47eb3d67b82ec7052a9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy <[email protected]>
Gerrit-Reviewer: Rush <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
