Andrew Bogott has submitted this change and it was merged.
Change subject: Turn the labs::nfs::client class off for eqiad.
......................................................................
Turn the labs::nfs::client class off for eqiad.
eqiad is NFS by default, and doesn't need this.
Also some lint cleanup while I'm in here.
Change-Id: Ic1749e3e93808f1bc380a7d975e76fed96b0c10d
---
M manifests/role/labsnfs.pp
1 file changed, 38 insertions(+), 33 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/labsnfs.pp b/manifests/role/labsnfs.pp
index 94cb297..ee226b7 100644
--- a/manifests/role/labsnfs.pp
+++ b/manifests/role/labsnfs.pp
@@ -2,40 +2,45 @@
# in LDAP once transition is over.
class role::labsnfs::client {
- $nfscluster = "labnfs.pmtpa.wmnet"
- file {
- "/etc/auto.master":
- ensure => file,
- owner => root,
- group => root,
- mode => 0444,
- content => template("labsnfs/auto.master.erb");
- }
- file { "/etc/auto.space":
- ensure => file,
- owner => root,
- group => root,
- mode => 0444,
- content => template("labsnfs/auto.space.erb");
- }
- file { "/etc/auto.time.home":
- ensure => file,
- owner => root,
- group => root,
- mode => 0444,
- content => template("labsnfs/auto.time.home.erb");
- }
- file { "/etc/auto.time.project":
- ensure => file,
- owner => root,
- group => root,
- mode => 0444,
- content => template("labsnfs/auto.time.project.erb");
- }
+ if $::site == 'pmtpa' {
+ $nfscluster = 'labnfs.pmtpa.wmnet'
- file { "/etc/init/nfs-noidmap.conf":
- source => "puppet:///files/nfs/upstart-nfs-noidmap.conf"
- }
+ file {
+ '/etc/auto.master':
+ ensure => file,
+ owner => root,
+ group => root,
+ mode => 0444,
+ content => template('labsnfs/auto.master.erb');
+ }
+ file { '/etc/auto.space':
+ ensure => file,
+ owner => root,
+ group => root,
+ mode => 0444,
+ content => template('labsnfs/auto.space.erb');
+ }
+ file { '/etc/auto.time.home':
+ ensure => file,
+ owner => root,
+ group => root,
+ mode => 0444,
+ content => template('labsnfs/auto.time.home.erb');
+ }
+ file { '/etc/auto.time.project':
+ ensure => file,
+ owner => root,
+ group => root,
+ mode => 0444,
+ content => template('labsnfs/auto.time.project.erb');
+ }
+
+ file { '/etc/init/nfs-noidmap.conf':
+ source => 'puppet:///files/nfs/upstart-nfs-noidmap.conf'
+ }
+ } else {
+ warning('Outside of pmtpa the role::labsnfs::client class is
deprecated and does nothing.')
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/115631
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1749e3e93808f1bc380a7d975e76fed96b0c10d
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
