Alexandros Kosiaris has submitted this change and it was merged.
Change subject: nfs cleanups
......................................................................
nfs cleanups
originals and thumbs are a long time now not used, no need to have a
codebase for them. Remove nfs classes::upload also related to the above.
Change-Id: I96e997ba6cd7d0dabba7d8eab01d7c06c2c220fc
---
M manifests/nfs.pp
1 file changed, 0 insertions(+), 68 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/nfs.pp b/manifests/nfs.pp
index 74f61f0..c81b516 100644
--- a/manifests/nfs.pp
+++ b/manifests/nfs.pp
@@ -128,38 +128,6 @@
}
}
-class nfs::netapp::originals($ensure='mounted', $mountpoint='/mnt/upload7') {
- include common
-
- file { $mountpoint:
- ensure => 'directory',
- }
-
- mount { $mountpoint:
- ensure => $ensure,
- require => File[$mountpoint],
- device => "${nfs::netapp::common::device}:/vol/originals",
- fstype => 'nfs',
- options => $nfs::netapp::common::options,
- }
-}
-
-class nfs::netapp::thumbs($ensure='mounted', $mountpoint='/mnt/thumbs2') {
- include common
-
- file { $mountpoint:
- ensure => 'directory',
- }
-
- mount { $mountpoint:
- ensure => $ensure,
- require => File[$mountpoint],
- device => "${nfs::netapp::common::device}:/vol/thumbs",
- fstype => 'nfs',
- options => $nfs::netapp::common::options,
- }
-}
-
# Historical /home/wikipedia
class nfs::home::wikipedia {
@@ -196,41 +164,6 @@
}
-class nfs::upload {
- include nfs::common
-
- # NetApp migration
- class { 'nfs::netapp::originals':
- ensure => 'absent',
- }
- class { 'nfs::netapp::thumbs':
- ensure => 'absent',
- }
-
- file { [ '/mnt/thumbs', '/mnt/upload6' ]:
- ensure => 'directory',
- }
-
-}
-
-# Setup /mnt/{thumbs,upload6} as symlink to /data/project/<subdir>
-class nfs::upload::labs {
- file { '/mnt/thumbs':
- ensure => 'absent',
- }
-
- file { '/mnt/upload6':
- ensure => 'link',
- target => '/data/project/upload6',
- }
-
-# Production started using upload7 on its config on mediawiki-config:158e6540
- file { '/mnt/upload7':
- ensure => 'link',
- target => '/data/project/upload7',
- }
-}
-
class nfs::data {
include nfs::common
@@ -254,7 +187,6 @@
remounts => false,
}
}
-
class nfs::netapp::fr_archive(
$ensure= 'mounted',
--
To view, visit https://gerrit.wikimedia.org/r/160984
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I96e997ba6cd7d0dabba7d8eab01d7c06c2c220fc
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
