Alexandros Kosiaris has submitted this change and it was merged.
Change subject: nfs: lint
......................................................................
nfs: lint
Change-Id: Ie411cc6611976270cc602029e62ee255b8fa0055
---
M manifests/nfs.pp
1 file changed, 242 insertions(+), 229 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/nfs.pp b/manifests/nfs.pp
index 14040ae..11b002f 100644
--- a/manifests/nfs.pp
+++ b/manifests/nfs.pp
@@ -4,319 +4,332 @@
#@monitor_group { "nfs": description => "NFS" }
class nfs::common {
- package { nfs-common:
- ensure => latest;
- }
+ package { 'nfs-common':
+ ensure => 'latest',
+ }
}
class nfs::server {
- include nfs::common
+ include nfs::common
- package { nfs-kernel-server:
- ensure => latest;
- }
+ package { 'nfs-kernel-server':
+ ensure => 'latest',
+ }
- if $static_nfs {
- file {
- '/etc/default/nfs-common':
- mode => 0444,
- owner => root,
- group => root,
- source => "puppet:///files/nfs/nfs-common",
- ensure => present,
- require => Package["nfs-common"];
- '/etc/default/nfs-kernel-server':
- mode => 0444,
- owner => root,
- group => root,
- source =>
"puppet:///files/nfs/nfs-kernel-server",
- ensure => present,
- require => Package["nfs-kernel-server"];
- '/etc/default/quota':
- mode => 0444,
- owner => root,
- group => root,
- source => "puppet:///files/nfs/quota",
- ensure => present,
- require => Package["nfs-kernel-server"];
- '/etc/modprobe.d/lockd.conf':
- mode => 0444,
- owner => root,
- group => root,
- source => "puppet:///files/nfs/lockd.conf",
- ensure => present,
- require => Package["nfs-kernel-server"];
- }
+ if $static_nfs {
+ file { '/etc/default/nfs-common':
+ ensure => 'present',
+ mode => '0444',
+ owner => 'root',
+ group => 'root',
+ source => 'puppet:///files/nfs/nfs-common',
+ require => Package['nfs-common'],
+ }
- }
+ file { '/etc/default/nfs-kernel-server':
+ ensure => 'present',
+ mode => '0444',
+ owner => 'root',
+ group => 'root',
+ source => 'puppet:///files/nfs/nfs-kernel-server',
+ require => Package['nfs-kernel-server'],
+ }
+
+ file { '/etc/default/quota':
+ ensure => 'present',
+ mode => '0444',
+ owner => 'root',
+ group => 'root',
+ source => 'puppet:///files/nfs/quota',
+ require => Package['nfs-kernel-server'],
+ }
+
+ file { '/etc/modprobe.d/lockd.conf':
+ ensure => 'present',
+ mode => '0444',
+ owner => 'root',
+ group => 'root',
+ source => 'puppet:///files/nfs/lockd.conf',
+ require => Package['nfs-kernel-server'],
+ }
+
+ }
}
class nfs::home {
- include nfs::common,
- nfs::home::wikipedia
+ include nfs::common
+ include nfs::home::wikipedia
- # Class admins tests whether Mount["/home"] is defined
- mount { "/home":
- device => "10.0.5.8:/home",
- fstype => "nfs",
- name => "/home",
- options => "bg,tcp,rsize=8192,wsize=8192,timeo=14,intr",
- ensure => mounted;
- }
+ # Class admins tests whether Mount["/home"] is defined
+ mount { '/home':
+ ensure => 'mounted',
+ device => '10.0.5.8:/home',
+ fstype => 'nfs',
+ name => '/home',
+ options => 'bg,tcp,rsize=8192,wsize=8192,timeo=14,intr',
+ }
}
# Classes for NetApp mounts used on multiple servers
class nfs::netapp::common {
- include nfs::common
+ include nfs::common
- $device = $::site ? {
- pmtpa => "nas1-a.pmtpa.wmnet",
- eqiad => "nas1001-a.eqiad.wmnet",
- default => undef,
- }
-
- $options = "bg,intr"
+ $device = $::site ? {
+ 'pmtpa' => 'nas1-a.pmtpa.wmnet',
+ 'eqiad' => 'nas1001-a.eqiad.wmnet',
+ default => undef,
+ }
+
+ $options = 'bg,intr'
}
-class nfs::netapp::home($ensure="mounted", $mountpoint="/home") {
- include common
+class nfs::netapp::home($ensure='mounted', $mountpoint='/home') {
+ include common
- file { $mountpoint: ensure => directory }
-
- mount { $mountpoint:
- require => File[$mountpoint],
- device => "${nfs::netapp::common::device}:/vol/home_${::site}",
- fstype => nfs,
- options => $nfs::netapp::common::options,
- ensure => $ensure
- }
+ file { $mountpoint:
+ ensure => 'directory',
+ }
+
+ mount { $mountpoint:
+ ensure => $ensure,
+ require => File[$mountpoint],
+ device => "${nfs::netapp::common::device}:/vol/home_${::site}",
+ fstype => 'nfs',
+ options => $nfs::netapp::common::options,
+ }
}
-class nfs::netapp::home::othersite($ensure="mounted", $mountpoint=undef) {
- include common
+class nfs::netapp::home::othersite($ensure='mounted', $mountpoint=undef) {
+ include common
- $peersite = $::site ? {
- 'pmtpa' => "eqiad",
- 'eqiad' => "pmtpa",
- default => undef
- }
- $path = $mountpoint ? {
- undef => "/srv/home_${peersite}",
- default => $mountpoint
- }
+ $peersite = $::site ? {
+ 'pmtpa' => 'eqiad',
+ 'eqiad' => 'pmtpa',
+ default => undef
+ }
+ $path = $mountpoint ? {
+ undef => "/srv/home_${peersite}",
+ default => $mountpoint
+ }
- file { $path: ensure => directory }
+ file { $path:
+ ensure => 'directory',
+ }
- mount { $path:
- require => File[$path],
- device =>
"${nfs::netapp::common::device}:/vol/home_${peersite}",
- fstype => nfs,
- options => "${nfs::netapp::common::options},ro",
- ensure => $ensure
- }
+ mount { $path:
+ ensure => $ensure,
+ require => File[$path],
+ device => "${nfs::netapp::common::device}:/vol/home_${peersite}",
+ fstype => 'nfs',
+ options => "${nfs::netapp::common::options},ro",
+ }
}
-class nfs::netapp::originals($ensure="mounted", $mountpoint="/mnt/upload7") {
- include common
-
- file { $mountpoint: ensure => directory }
-
- mount { $mountpoint:
- require => File[$mountpoint],
- device => "${nfs::netapp::common::device}:/vol/originals",
- fstype => nfs,
- options => $nfs::netapp::common::options,
- ensure => $ensure
- }
+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:
- require => File[$mountpoint],
- device => "${nfs::netapp::common::device}:/vol/thumbs",
- fstype => nfs,
- options => $nfs::netapp::common::options,
- ensure => $ensure
- }
+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 {
- case $::realm {
- 'production': {
- require nfs::home
- file { "/home/wikipedia":
- mode => 0755,
- owner => root,
- group => root,
- ensure => directory;
- }
- } # /production
- 'labs': {
- generic::systemuser { 'wikipediauser':
- name => 'wikipedia',
- home => '/home/wikipedia'
- }
+ case $::realm {
+ 'production': {
+ require nfs::home
+ file { '/home/wikipedia':
+ ensure => 'directory',
+ mode => '0755',
+ owner => 'root',
+ group => 'root',
+ }
+ } # /production
+ 'labs': {
+ generic::systemuser { 'wikipediauser':
+ name => 'wikipedia',
+ home => '/home/wikipedia',
+ }
- file { "/home/wikipedia":
- ensure => directory,
- require => Generic::Systemuser['wikipediauser']
- }
- }
- }
+ file { '/home/wikipedia':
+ ensure => 'directory',
+ require => Generic::Systemuser['wikipediauser'],
+ }
+ }
+ }
}
class nfs::upload {
- include nfs::common
+ include nfs::common
- # NetApp migration
- class { 'nfs::netapp::originals':
- ensure => absent,
- }
- class { 'nfs::netapp::thumbs':
- ensure => absent,
- }
+ # NetApp migration
+ class { 'nfs::netapp::originals':
+ ensure => 'absent',
+ }
+ class { 'nfs::netapp::thumbs':
+ ensure => 'absent',
+ }
- file { [ "/mnt/thumbs", "/mnt/upload6" ]:
- ensure => directory;
- }
+ file { [ '/mnt/thumbs', '/mnt/upload6' ]:
+ ensure => 'directory',
+ }
- mount {
- "/mnt/thumbs":
- device => "ms5.pmtpa.wmnet:/export/thumbs",
- fstype => "nfs",
- name => "/mnt/thumbs",
- options => "bg,soft,tcp,timeo=14,intr,nfsvers=3",
- require => File["/mnt/thumbs"],
- ensure => absent;
- }
+ mount { '/mnt/thumbs':
+ ensure => 'absent',
+ device => 'ms5.pmtpa.wmnet:/export/thumbs',
+ fstype => 'nfs',
+ name => '/mnt/thumbs',
+ options => 'bg,soft,tcp,timeo=14,intr,nfsvers=3',
+ require => File['/mnt/thumbs'],
+ }
}
# Setup /mnt/{thumbs,upload6} as symlink to /data/project/<subdir>
class nfs::upload::labs {
- file {
- "/mnt/thumbs":
- ensure => absent;
+ file { '/mnt/thumbs':
+ ensure => 'absent',
+ }
- "/mnt/upload6":
- ensure => link,
- target => "/data/project/upload6";
+ file { '/mnt/upload6':
+ ensure => 'link',
+ target => '/data/project/upload6',
+ }
- # Production started using upload7 on its config on
mediawiki-config:158e6540
- "/mnt/upload7":
- ensure => link,
- target => "/data/project/upload7";
- }
+# 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
+ include nfs::common
- file { [ '/mnt/data' ]:
- ensure => directory;
- }
+ file { [ '/mnt/data' ]:
+ ensure => 'directory',
+ }
$datasetserver = $::site ? {
- 'eqiad' => 'dataset1001.wikimedia.org',
- 'pmtpa' => 'dataset2.wikimedia.org',
- default => 'dataset2.wikimedia.org',
+ 'eqiad' => 'dataset1001.wikimedia.org',
+ 'pmtpa' => 'dataset2.wikimedia.org',
+ default => 'dataset2.wikimedia.org',
}
- mount {
- '/mnt/data':
- device => "${datasetserver}:/data",
- fstype => 'nfs',
- name => '/mnt/data',
- options =>
'bg,hard,tcp,rsize=8192,wsize=8192,intr,nfsvers=3',
- require => File['/mnt/data'],
- remounts => false,
- ensure => mounted;
- }
+ mount { '/mnt/data':
+ ensure => 'mounted',
+ device => "${datasetserver}:/data",
+ fstype => 'nfs',
+ name => '/mnt/data',
+ options => 'bg,hard,tcp,rsize=8192,wsize=8192,intr,nfsvers=3',
+ require => File['/mnt/data'],
+ remounts => false,
+ }
}
class nfs::netapp::fr_archive(
- $ensure="mounted",
- $mountpoint="/archive/udplogs"
+ $ensure= 'mounted',
+ $mountpoint= '/archive/udplogs'
) {
include common
- file { $mountpoint: ensure => directory }
+ file { $mountpoint:
+ ensure => 'directory',
+ }
mount { $mountpoint:
+ ensure => $ensure,
require => File[$mountpoint],
- device => "${nfs::netapp::common::device}:/vol/fr_archive",
- fstype => nfs,
+ device => "${nfs::netapp::common::device}:/vol/fr_archive",
+ fstype => 'nfs',
options => $nfs::netapp::common::options,
- ensure => $ensure
}
}
# moved here from misc-servers.pp
class misc::nfs-server::home {
- system::role { "misc::nfs-server::home": description => "/home NFS" }
+ system::role { 'misc::nfs-server::home': description => '/home NFS' }
- class backup {
- cron { home-rsync:
- require => File["/root/.ssh/home-rsync"],
- command => '[ -d /home/wikipedia ] && rsync --rsh="ssh
-c blowfish-cbc -i /root/.ssh/home-rsync" -azu /home/*
[email protected]:~/home/',
- user => root,
- hour => 2,
- minute => 35,
- weekday => 6,
- ensure => present;
- }
+ class backup {
+ cron { 'home-rsync':
+ ensure => 'present',
+ require => File['/root/.ssh/home-rsync'],
+ command => '[ -d /home/wikipedia ] && rsync --rsh="ssh -c
blowfish-cbc -i /root/.ssh/home-rsync" -azu /home/*
[email protected]:~/home/',
+ user => 'root',
+ hour => 2,
+ minute => 35,
+ weekday => 6,
+ }
- file { "/root/.ssh/home-rsync":
- owner => root,
- group => root,
- mode => 0400,
- source =>
"puppet:///private/backup/ssh-keys/home-rsync";
- }
- }
+ file { '/root/.ssh/home-rsync':
+ owner => 'root',
+ group => 'root',
+ mode => '0400',
+ source => 'puppet:///private/backup/ssh-keys/home-rsync',
+ }
+ }
- package { nfs-kernel-server:
- ensure => latest;
- }
+ package { 'nfs-kernel-server':
+ ensure => 'latest',
+ }
- file { "/etc/exports":
- require => Package[nfs-kernel-server],
- mode => 0444,
- owner => root,
- group => root,
- source => "puppet:///files/nfs/exports.home";
- }
+ file { '/etc/exports':
+ require => Package['nfs-kernel-server'],
+ mode => '0444',
+ owner => 'root',
+ group => 'root',
+ source => 'puppet:///files/nfs/exports.home',
+ }
- service { nfs-kernel-server:
- require => [ Package[nfs-kernel-server], File["/etc/exports"] ],
- subscribe => File["/etc/exports"];
- }
+ service { 'nfs-kernel-server':
+ require => [ Package['nfs-kernel-server'], File['/etc/exports'] ],
+ subscribe => File['/etc/exports'],
+ }
- class monitoring {
- monitor_service { "nfs": description => "NFS", check_command =>
"check_tcp!2049" }
- }
+ class monitoring {
+ monitor_service { 'nfs': description => 'NFS', check_command =>
'check_tcp!2049' }
+ }
- include monitoring
+ include monitoring
}
class misc::nfs-server::home::rsyncd {
- system::role { "misc::nfs-server::home::rsyncd": description => "/home
rsync daemon" }
+ system::role { 'misc::nfs-server::home::rsyncd': description => '/home
rsync daemon' }
- include rsync::server
- rsync::server::module {
- 'httpdconf':
- path => '/home/wikipedia/conf/httpd',
- read_only => 'true',
- hosts_allow => ['10.0.0.0/16', '10.64.0.0/22',
'10.64.16.0/24', '208.80.152.0/22', '10.64.32.0/22'];
+ include rsync::server
+ rsync::server::module { 'httpdconf':
+ path => '/home/wikipedia/conf/httpd',
+ read_only => 'true',
+ hosts_allow => ['10.0.0.0/16', '10.64.0.0/22', '10.64.16.0/24',
'208.80.152.0/22', '10.64.32.0/22'],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/109081
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie411cc6611976270cc602029e62ee255b8fa0055
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Matanya <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
