Andrew Bogott has uploaded a new change for review. https://gerrit.wikimedia.org/r/115631
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, 36 insertions(+), 33 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/31/115631/1 diff --git a/manifests/role/labsnfs.pp b/manifests/role/labsnfs.pp index 94cb297..0e30950 100644 --- a/manifests/role/labsnfs.pp +++ b/manifests/role/labsnfs.pp @@ -2,40 +2,43 @@ # 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' + } + } } -- To view, visit https://gerrit.wikimedia.org/r/115631 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic1749e3e93808f1bc380a7d975e76fed96b0c10d Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits