Andrew Bogott has submitted this change and it was merged.
Change subject: labstore: lint fixes
......................................................................
labstore: lint fixes
Change-Id: I8b00ec04ab4043eba32fa82ef4926a3a0c08c8ec
---
M modules/labstore/manifests/fileserver.pp
M modules/labstore/manifests/fileserver/cleanup_snapshots.pp
M modules/labstore/manifests/fileserver/exports.pp
M modules/labstore/manifests/fileserver/replicate.pp
M modules/labstore/manifests/init.pp
M modules/labstore/manifests/replica_users.pp
6 files changed, 30 insertions(+), 30 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/labstore/manifests/fileserver.pp
b/modules/labstore/manifests/fileserver.pp
index 2bdeff7..84fcf64 100644
--- a/modules/labstore/manifests/fileserver.pp
+++ b/modules/labstore/manifests/fileserver.pp
@@ -40,10 +40,10 @@
}
file { '/usr/local/sbin/cleanup-snapshots':
- source => 'puppet:///modules/labstore/cleanup-snapshots',
- owner => 'root',
- group => 'root',
- mode => '0544',
+ source => 'puppet:///modules/labstore/cleanup-snapshots',
+ owner => 'root',
+ group => 'root',
+ mode => '0544',
}
if $is_active {
@@ -83,11 +83,11 @@
# active one.
file { '/usr/local/sbin/start-nfs':
- ensure => present,
- owner => 'root',
- group => 'root',
- mode => '0550',
- source => 'puppet:///modules/labstore/start-nfs',
+ ensure => present,
+ owner => 'root',
+ group => 'root',
+ mode => '0550',
+ source => 'puppet:///modules/labstore/start-nfs',
}
include ::labstore::fileserver::exports
diff --git a/modules/labstore/manifests/fileserver/cleanup_snapshots.pp
b/modules/labstore/manifests/fileserver/cleanup_snapshots.pp
index 65aea67..2413fe6 100644
--- a/modules/labstore/manifests/fileserver/cleanup_snapshots.pp
+++ b/modules/labstore/manifests/fileserver/cleanup_snapshots.pp
@@ -11,8 +11,8 @@
$volume_group = $title,
) {
base::service_unit { "cleanup-snapshots-${volume_group}":
- template_name => 'cleanup-snapshots',
ensure => present,
+ template_name => 'cleanup-snapshots',
systemd => true,
declare_service => false,
}
diff --git a/modules/labstore/manifests/fileserver/exports.pp
b/modules/labstore/manifests/fileserver/exports.pp
index 1fcac26..04ea85b 100644
--- a/modules/labstore/manifests/fileserver/exports.pp
+++ b/modules/labstore/manifests/fileserver/exports.pp
@@ -33,7 +33,7 @@
'ALL = NOPASSWD: /usr/local/sbin/sync-exports',
'ALL = NOPASSWD: /usr/sbin/exportfs',
],
- require => User['nfsmanager'],
+ require => User['nfsmanager'],
}
file { '/usr/local/sbin/sync-exports':
diff --git a/modules/labstore/manifests/fileserver/replicate.pp
b/modules/labstore/manifests/fileserver/replicate.pp
index 0bdc449..51cb0f1 100644
--- a/modules/labstore/manifests/fileserver/replicate.pp
+++ b/modules/labstore/manifests/fileserver/replicate.pp
@@ -12,8 +12,8 @@
$calendar,
) {
base::service_unit { "replicate-${title}":
- template_name => 'replicate',
ensure => present,
+ template_name => 'replicate',
systemd => true,
declare_service => false,
}
@@ -23,14 +23,14 @@
# systemd.
file { "/etc/systemd/system/replicate-${title}.timer":
ensure => present,
- owner => "root",
- group => "root",
- mode => "0444",
- content => template("labstore/initscripts/replicate.timer.erb"),
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ content => template('labstore/initscripts/replicate.timer.erb'),
}
nrpe::monitor_systemd_unit_state { "replicate-${title}":
description => "Last backup of the ${title} filesystem",
- expected_state => "periodic 90000", # 25h (i.e. daily but with a bit
of give)
+ expected_state => 'periodic 90000', # 25h (i.e. daily but with a bit
of give)
}
}
diff --git a/modules/labstore/manifests/init.pp
b/modules/labstore/manifests/init.pp
index 243fda6..989cc5b 100644
--- a/modules/labstore/manifests/init.pp
+++ b/modules/labstore/manifests/init.pp
@@ -10,11 +10,11 @@
require_package('nfs-kernel-server')
file { '/usr/local/sbin/set-stripe-cache':
- ensure => present,
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/labstore/set-stripe-cache',
+ ensure => present,
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => 'puppet:///modules/labstore/set-stripe-cache',
}
# This is done unconditionally to all the md devices at
@@ -41,10 +41,10 @@
}
file { '/root/.ssh/id_labstore':
- ensure => present,
- owner => 'root',
- group => 'root',
- mode => '0400',
+ ensure => present,
+ owner => 'root',
+ group => 'root',
+ mode => '0400',
content => secret('labstore/id_labstore'),
}
diff --git a/modules/labstore/manifests/replica_users.pp
b/modules/labstore/manifests/replica_users.pp
index 9b4e396..2b0bbdd 100644
--- a/modules/labstore/manifests/replica_users.pp
+++ b/modules/labstore/manifests/replica_users.pp
@@ -12,10 +12,10 @@
}
file { '/etc/init/replica-addusers.conf':
- source => 'puppet:///modules/labstore/replica-addusers.conf',
- owner => 'root',
- group => 'root',
- mode => '0444',
+ source => 'puppet:///modules/labstore/replica-addusers.conf',
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
require => File['/usr/local/sbin/replica-addusers.pl'],
}
--
To view, visit https://gerrit.wikimedia.org/r/249678
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8b00ec04ab4043eba32fa82ef4926a3a0c08c8ec
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: coren <mpellet...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
