Dzahn has submitted this change and it was merged.
Change subject: remove deprecated labsnfs class and files
......................................................................
remove deprecated labsnfs class and files
per comment from Tim Landscheidt on
Ibd8f7b8b23a69
the entire section that is being removed
only applied to pmtpa, but pmtpa is gone
also delete all the referenced templates,
only keep the warning
Change-Id: I7561d5f39086fe6b6fe371aa280ecb1300e730b2
---
M manifests/role/labsnfs.pp
D templates/labsnfs/auto.master.erb
D templates/labsnfs/auto.space.erb
D templates/labsnfs/auto.time.home.erb
D templates/labsnfs/auto.time.project.erb
5 files changed, 1 insertion(+), 52 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, but someone else must approve
coren: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/labsnfs.pp b/manifests/role/labsnfs.pp
index 25b3082..233ef80 100644
--- a/manifests/role/labsnfs.pp
+++ b/manifests/role/labsnfs.pp
@@ -3,43 +3,6 @@
class role::labsnfs::client {
- if $::site == 'pmtpa' {
- $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');
- }
-
- 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.')
- }
+ warning('Outside of pmtpa the role::labsnfs::client class is deprecated
and does nothing.')
}
diff --git a/templates/labsnfs/auto.master.erb
b/templates/labsnfs/auto.master.erb
deleted file mode 100644
index 65a5f83..0000000
--- a/templates/labsnfs/auto.master.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Managed by PUPPET (role::labs-nfs-client)
-#
-/- file:/etc/auto.space
port=0,nfsvers=4,ro,hard,rsize=8192,wsize=8192,sec=sys
-#+auto.master
diff --git a/templates/labsnfs/auto.space.erb b/templates/labsnfs/auto.space.erb
deleted file mode 100644
index eb1a486..0000000
--- a/templates/labsnfs/auto.space.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-/home / -fstype=nfs4,rw <%= nfscluster %>:/<%= instanceproject %>/home \
- /.snapshot -fstype=autofs,ghost file:/etc/auto.time.home
-/data /project -fstype=nfs4,rw <%= nfscluster %>:/<%= instanceproject
%>/project \
- /project/.snapshot -fstype=autofs,ghost file:/etc/auto.time.project
-/public /keys -nfsvers=3,ro,ghost labstore1.pmtpa.wmnet:/keys \
- /datasets -nfsvers=3,ro,ghost labstore1.pmtpa.wmnet:/publicdata-project
\
- /pagecounts -fstype=nfs4,ro <%= nfscluster %>:/pagecounts
diff --git a/templates/labsnfs/auto.time.home.erb
b/templates/labsnfs/auto.time.home.erb
deleted file mode 100644
index 50e3ae1..0000000
--- a/templates/labsnfs/auto.time.home.erb
+++ /dev/null
@@ -1 +0,0 @@
-* -fstype=nfs4,ghost <%= nfscluster %>:/<%= instanceproject
%>/.snapshot/&/home
diff --git a/templates/labsnfs/auto.time.project.erb
b/templates/labsnfs/auto.time.project.erb
deleted file mode 100644
index 74d9c79..0000000
--- a/templates/labsnfs/auto.time.project.erb
+++ /dev/null
@@ -1 +0,0 @@
-* -fstype=nfs4,ro,ghost <%= nfscluster %>:/<%= instanceproject
%>/.snapshot/&/project
--
To view, visit https://gerrit.wikimedia.org/r/164421
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7561d5f39086fe6b6fe371aa280ecb1300e730b2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Tim Landscheidt <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
