Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/138282
Change subject: labs: lint, clean and remove heartbleed leftover
......................................................................
labs: lint, clean and remove heartbleed leftover
Change-Id: Ia094ffd20e732827ab3468ccd23ef20000f7bde7
---
M manifests/role/labs.pp
1 file changed, 53 insertions(+), 34 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/82/138282/1
diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index bbccf3a..2d3ac8f 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -1,11 +1,12 @@
-
class role::labs::instance {
- include ldap::role::client::labs,
- base::instance-upstarts
+ include ldap::role::client::labs
+ include base::instance-upstarts
# make common logs readable
- class {'base::syslogs': readable => true }
+ class { 'base::syslogs':
+ readable => true,
+ }
# Directory for data mounts
file { '/data':
@@ -23,11 +24,6 @@
mode => '0755',
}
- #is this heartbleed leftovers?
- package { 'libssl1.0.0':
- ensure => latest,
- }
-
package { 'puppet-lint':
ensure => present,
}
@@ -36,73 +32,96 @@
$nfs_server = 'labstore.svc.eqiad.wmnet'
mount { '/home':
- ensure => mounted, atboot => true, fstype => 'nfs', options =>
"rw,${nfs_opts}",
- device => "${nfs_server}:/project/${instanceproject}/home",
+ ensure => mounted,
+ atboot => true,
+ fstype => 'nfs',
+ options => "rw,${nfs_opts}",
+ device => "${nfs_server}:/project/${instanceproject}/home",
}
file { '/data/project':
- ensure => directory,
- require => File['/data', '/etc/idmapd.conf'],
+ ensure => directory,
+ require => File['/data',
+ '/etc/idmapd.conf',
+ ],
}
+
mount { '/data/project':
- ensure => mounted, atboot => true, fstype => 'nfs', options =>
"rw,${nfs_opts}",
- device => "${nfs_server}:/project/${instanceproject}/project",
+ ensure => mounted,
+ atboot => true,
+ fstype => 'nfs',
+ options => "rw,${nfs_opts}",
+ device => "${nfs_server}:/project/${instanceproject}/project",
require => File['/data/project'],
}
file { '/data/scratch':
- ensure => directory,
- require => File['/data', '/etc/idmapd.conf'],
+ ensure => directory,
+ require => File['/data',
+ '/etc/idmapd.conf',
+ ],
}
mount { '/data/scratch':
- ensure => mounted, atboot => true, fstype => 'nfs', options =>
"rw,${nfs_opts}",
- device => "${nfs_server}:/scratch",
+ ensure => mounted,
+ atboot => true,
+ fstype => 'nfs',
+ options => "rw,${nfs_opts}",
+ device => "${nfs_server}:/scratch",
require => File['/data/scratch'],
}
file { '/public/dumps':
- ensure => directory,
+ ensure => directory,
require => File['/public'],
}
mount { '/public/dumps':
- ensure => mounted, atboot => true, fstype => 'nfs', options =>
"ro,${nfs_opts}",
- device => "${nfs_server}:/dumps",
+ ensure => mounted,
+ atboot => true,
+ fstype => 'nfs',
+ options => "ro,${nfs_opts}",
+ device => "${nfs_server}:/dumps",
require => File['/public/dumps'],
}
file { '/public/backups':
- ensure => directory,
+ ensure => directory,
require => File['/public'],
}
mount { '/public/backups':
- ensure => mounted, atboot => true, fstype => 'nfs', options =>
"ro,${nfs_opts}",
- device => "${nfs_server}:/backups",
+ ensure => mounted,
+ atboot => true,
+ fstype => 'nfs',
+ options => "ro,${nfs_opts}",
+ device => "${nfs_server}:/backups",
require => File['/public/backups'],
}
file { '/public/keys':
- ensure => directory,
+ ensure => directory,
require => File['/public'],
}
mount { '/public/keys':
- ensure => mounted, atboot => true, fstype => 'nfs', options =>
"ro,${nfs_opts}",
- device => "${nfs_server}:/keys",
+ ensure => mounted,
+ atboot => true,
+ fstype => 'nfs',
+ options => "ro,${nfs_opts}",
+ device => "${nfs_server}:/keys",
require => File['/public/keys'],
- notify => Service['ssh'],
+ notify => Service['ssh'],
}
service { 'idmapd':
- ensure => running,
+ ensure => running,
subscribe => File['/etc/idmapd.conf'],
- provider => upstart,
+ provider => upstart,
}
file { '/etc/idmapd.conf':
ensure => present,
- owner => root,
- group => root,
- mode => 0444,
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
source => 'puppet:///files/nfs/idmapd.conf',
}
--
To view, visit https://gerrit.wikimedia.org/r/138282
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia094ffd20e732827ab3468ccd23ef20000f7bde7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <mata...@foss.co.il>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
