Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/107356
Change subject: bacula: lint clean
......................................................................
bacula: lint clean
Change-Id: Ifa52cd25ca01f73228243b797dff6eea2ea124bc
---
M modules/bacula/manifests/client.pp
M modules/bacula/manifests/client/job.pp
M modules/bacula/manifests/client/mysql-bpipe.pp
M modules/bacula/manifests/storage.pp
M modules/bacula/manifests/storage/device.pp
5 files changed, 34 insertions(+), 34 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/56/107356/1
diff --git a/modules/bacula/manifests/client.pp
b/modules/bacula/manifests/client.pp
index 23c9c03..39c2b54 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -46,8 +46,8 @@
file { '/etc/bacula/bacula-fd.conf':
ensure => present,
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
mode => '0400',
notify => Service['bacula-fd'],
content => template('bacula/bacula-fd.conf.erb'),
@@ -61,20 +61,20 @@
# managed one. Bacula needs the keypair in one single file though hence
this
# resource
exec { 'concat-bacula-keypair':
- command => "/bin/cat /var/lib/puppet/ssl/certs/$::fqdn.pem \
- /var/lib/puppet/ssl/private_keys/$::fqdn.pem > \
- /var/lib/puppet/ssl/private_keys/bacula-keypair-$::fqdn.pem",
- creates =>
"/var/lib/puppet/ssl/private_keys/bacula-keypair-$::fqdn.pem",
+ command => "/bin/cat /var/lib/puppet/ssl/certs/${::fqdn}.pem \
+ /var/lib/puppet/ssl/private_keys/${::fqdn}.pem > \
+ /var/lib/puppet/ssl/private_keys/bacula-keypair-${::fqdn}.pem",
+ creates =>
"/var/lib/puppet/ssl/private_keys/bacula-keypair-${::fqdn}.pem",
}
# We export oufself to the director
- @@file { "/etc/bacula/clients.d/$::fqdn.conf":
+ @@file { "/etc/bacula/clients.d/${::fqdn}.conf":
ensure => present,
- owner => root,
- group => bacula,
+ owner => 'root',
+ group => 'bacula',
mode => '0440',
content => template('bacula/bacula-client.erb'),
notify => Service['bacula-director'],
- tag => "bacula-client-$director",
+ tag => "bacula-client-${director}",
}
}
diff --git a/modules/bacula/manifests/client/job.pp
b/modules/bacula/manifests/client/job.pp
index 5e66b2d..4ccb6fe 100644
--- a/modules/bacula/manifests/client/job.pp
+++ b/modules/bacula/manifests/client/job.pp
@@ -27,12 +27,12 @@
# We export to the director
@@file { "/etc/bacula/jobs.d/${::fqdn}-${name}.conf":
ensure => present,
- owner => root,
- group => bacula,
+ owner => 'root',
+ group => 'bacula',
mode => '0440',
content => template('bacula/bacula-client-job.erb'),
notify => Service['bacula-director'],
require => File['/etc/bacula/jobs.d'],
- tag => "bacula-client-$director",
+ tag => "bacula-client-${director}",
}
}
diff --git a/modules/bacula/manifests/client/mysql-bpipe.pp
b/modules/bacula/manifests/client/mysql-bpipe.pp
index 515d952..6a3aed7 100644
--- a/modules/bacula/manifests/client/mysql-bpipe.pp
+++ b/modules/bacula/manifests/client/mysql-bpipe.pp
@@ -33,10 +33,10 @@
#
# Sample Usage:
# bacula::client::mysql-bpipe { 'mybpipe':
-# per_database => false,
-# xtrabackup => true,
-# xbstream_dir => '/var/tmp/xbstream',
-# mysqldump_innodb_only => false,
+# per_database => false,
+# xtrabackup => true,
+# xbstream_dir => '/var/tmp/xbstream',
+# mysqldump_innodb_only => false,
# }
define bacula::client::mysql-bpipe(
@@ -50,8 +50,8 @@
) {
file { "/etc/bacula/scripts/bpipe-mysql-${name}":
ensure => present,
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
mode => '0550',
content => template('bacula/bpipe-mysql-db.erb'),
require => Class['bacula::client'],
@@ -64,10 +64,10 @@
}
}
- file { "$xbstream_dir":
+ file { $xbstream_dir:
ensure => directory,
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
mode => '0440',
}
}
diff --git a/modules/bacula/manifests/storage.pp
b/modules/bacula/manifests/storage.pp
index b8f6c27..fe26f4c 100644
--- a/modules/bacula/manifests/storage.pp
+++ b/modules/bacula/manifests/storage.pp
@@ -35,13 +35,13 @@
# bacula-sd depends on bacula-sd-sqlvariant. Let's rely on dependencies to
# install it
- package { "bacula-sd-$sqlvariant":
+ package { "bacula-sd-${sqlvariant}":
ensure => installed,
}
service { 'bacula-sd':
ensure => running,
- require => Package["bacula-sd-$sqlvariant"],
+ require => Package["bacula-sd-${sqlvariant}"],
}
file { '/etc/bacula/sd-devices.d':
@@ -50,18 +50,18 @@
force => true,
purge => true,
mode => '0444',
- owner => root,
- group => bacula,
+ owner => 'root',
+ group => 'bacula',
require => File['/etc/bacula/bacula-sd.conf'],
}
file { '/etc/bacula/bacula-sd.conf':
ensure => present,
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
mode => '0400',
notify => Service['bacula-sd'],
content => template('bacula/bacula-sd.conf.erb'),
- require => Package["bacula-sd-$sqlvariant"],
+ require => Package["bacula-sd-${sqlvariant}"],
}
}
diff --git a/modules/bacula/manifests/storage/device.pp
b/modules/bacula/manifests/storage/device.pp
index 363caf4..c53a0ca 100644
--- a/modules/bacula/manifests/storage/device.pp
+++ b/modules/bacula/manifests/storage/device.pp
@@ -44,8 +44,8 @@
file { "/etc/bacula/sd-devices.d/${name}.conf":
ensure => present,
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
mode => '0400',
notify => Service['bacula-sd'],
content => template('bacula/bacula-sd.device.conf.erb'),
@@ -55,12 +55,12 @@
# We export ourself to the director
@@file { "/etc/bacula/storages.d/${::hostname}-${name}.conf":
ensure => present,
- owner => root,
- group => bacula,
+ owner => 'root',
+ group => 'bacula',
mode => '0640',
content => template('bacula/bacula-storage.erb'),
notify => Service['bacula-director'],
require => File['/etc/bacula/storages.d'],
- tag => "bacula-storage-$director",
+ tag => "bacula-storage-${director}",
}
}
--
To view, visit https://gerrit.wikimedia.org/r/107356
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifa52cd25ca01f73228243b797dff6eea2ea124bc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
