Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/238779
Change subject: rubocop: Fixed Style/TrailingComma offense
......................................................................
rubocop: Fixed Style/TrailingComma offense
Bug: T112651
Change-Id: I9a7b6e9d5a94525770dc0ea9db843a556dea7577
---
M .rubocop_todo.yml
M modules/backup/Rakefile
M modules/backup/spec/defines/schedule_spec.rb
M modules/backup/spec/defines/set_spec.rb
M modules/backup/spec/defines/weeklyschedule_spec.rb
M modules/bacula/Rakefile
M modules/bacula/spec/classes/bacula_client_spec.rb
M modules/bacula/spec/classes/bacula_director_spec.rb
M modules/bacula/spec/classes/bacula_storage_spec.rb
M modules/bacula/spec/defines/catalog_spec.rb
M modules/bacula/spec/defines/fileset_spec.rb
M modules/bacula/spec/defines/job_spec.rb
M modules/bacula/spec/defines/jobdefaults_spec.rb
M modules/bacula/spec/defines/mysql-bpipe_spec.rb
M modules/bacula/spec/defines/pool_spec.rb
M modules/bacula/spec/defines/schedule_spec.rb
M modules/bacula/spec/defines/storage_device_spec.rb
M modules/base/Rakefile
M modules/git/spec/defines/user_spec.rb
M modules/install_server/Rakefile
M modules/install_server/spec/classes/install_server_apt_repository_spec.rb
M modules/install_server/spec/classes/install_server_dhcp_server_spec.rb
M modules/install_server/spec/classes/install_server_preseed_server_spec.rb
M modules/install_server/spec/classes/install_server_tftp_server_spec.rb
M modules/install_server/spec/classes/install_server_web_server_spec.rb
M modules/mirrors/Rakefile
M modules/mirrors/spec/classes/mirrors_debian_spec.rb
M modules/mirrors/spec/classes/mirrors_spec.rb
M modules/mirrors/spec/classes/mirrors_ubuntu_spec.rb
M modules/nrpe/Rakefile
M modules/nrpe/spec/defines/monitor_service_spec.rb
M modules/osm/Rakefile
M modules/osm/spec/classes/osm_spec.rb
M modules/osm/spec/defines/osm_planet_import_spec.rb
M modules/osm/spec/defines/osm_planet_sync_spec.rb
M modules/osm/spec/defines/osm_shapefile_import_spec.rb
M modules/osm/spec/defines/osm_usergrants_spec.rb
M modules/postgresql/Rakefile
M modules/postgresql/spec/classes/postgresql_ganglia.rb
M modules/postgresql/spec/classes/postgresql_master_spec.rb
M modules/postgresql/spec/classes/postgresql_postgis_spec.rb
M modules/postgresql/spec/classes/postgresql_server_spec.rb
M modules/postgresql/spec/classes/postgresql_slave_spec.rb
M modules/postgresql/spec/defines/postgresql_spatial_db_spec.rb
M modules/postgresql/spec/defines/postgresql_user_spec.rb
M modules/puppetmaster/lib/puppet/reports/logstash.rb
M modules/servermon/Rakefile
M modules/squid3/Rakefile
M modules/squid3/spec/classes/squid3_spec.rb
M modules/strongswan/Rakefile
M modules/wmflib/Rakefile
M modules/wmflib/lib/puppet/parser/functions/os_version.rb
M modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
53 files changed, 114 insertions(+), 120 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/79/238779/1
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index efc8d3a..23e8703 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -437,12 +437,6 @@
Exclude:
- 'modules/base/lib/facter/labsproject.rb'
-# Offense count: 116
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
-Style/TrailingComma:
- Enabled: false
-
# Offense count: 1
Style/UnlessElse:
Exclude:
diff --git a/modules/backup/Rakefile b/modules/backup/Rakefile
index d9226a8..798a17c 100644
--- a/modules/backup/Rakefile
+++ b/modules/backup/Rakefile
@@ -7,7 +7,7 @@
symlinks = { 'spec/fixtures/modules/%s/files' % modulename =>
'../../../../files',
'spec/fixtures/modules/%s/manifests' % modulename => '../../../../manifests',
- 'spec/fixtures/modules/%s/templates' % modulename => '../../../../templates',
+ 'spec/fixtures/modules/%s/templates' % modulename => '../../../../templates'
}
diff --git a/modules/backup/spec/defines/schedule_spec.rb
b/modules/backup/spec/defines/schedule_spec.rb
index 0962a86..acccddd 100644
--- a/modules/backup/spec/defines/schedule_spec.rb
+++ b/modules/backup/spec/defines/schedule_spec.rb
@@ -3,19 +3,19 @@
describe 'backup::schedule', :type => :define do
let(:title) { 'something' }
let(:params) { {
- :pool => 'unimportant',
+ :pool => 'unimportant'
}
}
let(:pre_condition) do
[
'define bacula::director::jobdefaults($when, $pool) {}',
- 'define bacula::director::schedule($runs) {}',
+ 'define bacula::director::schedule($runs) {}'
]
end
it 'should create bacula::director::jobdefaults' do
should
contain_bacula__director__jobdefaults("Monthly-1st-#{title}-unimportant").with({
'when' => "Monthly-1st-#{title}",
- 'pool' => 'unimportant',
+ 'pool' => 'unimportant'
})
end
it 'should create bacula::director::schedule' do
diff --git a/modules/backup/spec/defines/set_spec.rb
b/modules/backup/spec/defines/set_spec.rb
index bd005a5..f538a4e 100644
--- a/modules/backup/spec/defines/set_spec.rb
+++ b/modules/backup/spec/defines/set_spec.rb
@@ -3,13 +3,13 @@
describe 'backup::set', :type => :define do
let(:title) { 'something' }
let(:params) { {
- :jobdefaults => 'unimportant',
+ :jobdefaults => 'unimportant'
}
}
let(:pre_condition) do
[
'File <| |>',
- 'define bacula::client::job($fileset, $jobdefaults) {}',
+ 'define bacula::client::job($fileset, $jobdefaults) {}'
]
end
end
diff --git a/modules/backup/spec/defines/weeklyschedule_spec.rb
b/modules/backup/spec/defines/weeklyschedule_spec.rb
index 6a35dd2..aed52cc 100644
--- a/modules/backup/spec/defines/weeklyschedule_spec.rb
+++ b/modules/backup/spec/defines/weeklyschedule_spec.rb
@@ -3,19 +3,19 @@
describe 'backup::weeklyschedule', :type => :define do
let(:title) { 'something' }
let(:params) { {
- :pool => 'unimportant',
+ :pool => 'unimportant'
}
}
let(:pre_condition) do
[
'define bacula::director::jobdefaults($when, $pool) {}',
- 'define bacula::director::schedule($runs) {}',
+ 'define bacula::director::schedule($runs) {}'
]
end
it 'should create bacula::director::jobdefaults' do
should
contain_bacula__director__jobdefaults("Weekly-#{title}-unimportant").with({
'when' => "Weekly-#{title}",
- 'pool' => 'unimportant',
+ 'pool' => 'unimportant'
})
end
it 'should create bacula::director::schedule' do
diff --git a/modules/bacula/Rakefile b/modules/bacula/Rakefile
index d9226a8..798a17c 100644
--- a/modules/bacula/Rakefile
+++ b/modules/bacula/Rakefile
@@ -7,7 +7,7 @@
symlinks = { 'spec/fixtures/modules/%s/files' % modulename =>
'../../../../files',
'spec/fixtures/modules/%s/manifests' % modulename => '../../../../manifests',
- 'spec/fixtures/modules/%s/templates' % modulename => '../../../../templates',
+ 'spec/fixtures/modules/%s/templates' % modulename => '../../../../templates'
}
diff --git a/modules/bacula/spec/classes/bacula_client_spec.rb
b/modules/bacula/spec/classes/bacula_client_spec.rb
index c289d4c..350a838 100644
--- a/modules/bacula/spec/classes/bacula_client_spec.rb
+++ b/modules/bacula/spec/classes/bacula_client_spec.rb
@@ -8,7 +8,7 @@
:file_retention => 'testfr',
:job_retention => 'testjr',
:fdport => '2000',
- :directorpassword => 'testdirectorpass',
+ :directorpassword => 'testdirectorpass'
}
}
@@ -20,7 +20,7 @@
'ensure' => 'present',
'owner' => 'root',
'group' => 'root',
- 'mode' => '0400',
+ 'mode' => '0400'
}) \
.with_content(/Name = "testdirector"/) \
.with_content(/Password = "testdirectorpass"/) \
diff --git a/modules/bacula/spec/classes/bacula_director_spec.rb
b/modules/bacula/spec/classes/bacula_director_spec.rb
index 589c188..00cfbba 100644
--- a/modules/bacula/spec/classes/bacula_director_spec.rb
+++ b/modules/bacula/spec/classes/bacula_director_spec.rb
@@ -6,7 +6,7 @@
:max_dir_concur_jobs => '10',
:sqlvariant => 'testsql',
:dir_port => '9900',
- :bconsolepassword => 'bconsolepass',
+ :bconsolepassword => 'bconsolepass'
}
}
@@ -20,7 +20,7 @@
'purge' => 'true',
'mode' => '0444',
'owner' => 'root',
- 'group' => 'bacula',
+ 'group' => 'bacula'
})
end
it do
@@ -31,7 +31,7 @@
'purge' => 'true',
'mode' => '0444',
'owner' => 'root',
- 'group' => 'bacula',
+ 'group' => 'bacula'
})
end
it do
@@ -42,7 +42,7 @@
'purge' => 'true',
'mode' => '0444',
'owner' => 'root',
- 'group' => 'bacula',
+ 'group' => 'bacula'
})
end
it do
@@ -53,7 +53,7 @@
'purge' => 'true',
'mode' => '0444',
'owner' => 'root',
- 'group' => 'bacula',
+ 'group' => 'bacula'
})
end
it 'should generate valid content for /etc/bacula/bacula-dir.conf' do
@@ -61,7 +61,7 @@
'ensure' => 'present',
'owner' => 'root',
'group' => 'bacula',
- 'mode' => '0440',
+ 'mode' => '0440'
}) \
.with_content(/Name = "testhost.example.com"/) \
.with_content(/Password = "bconsolepass"/) \
@@ -75,7 +75,7 @@
'ensure' => 'file',
'owner' => 'root',
'group' => 'bacula',
- 'mode' => '0444',
+ 'mode' => '0444'
}) \
.with_content(/Client = testhost.example.com-fd/) \
.with_content(/Type = Restore/) \
diff --git a/modules/bacula/spec/classes/bacula_storage_spec.rb
b/modules/bacula/spec/classes/bacula_storage_spec.rb
index e33364e..8e50316 100644
--- a/modules/bacula/spec/classes/bacula_storage_spec.rb
+++ b/modules/bacula/spec/classes/bacula_storage_spec.rb
@@ -7,7 +7,7 @@
:sd_max_concur_jobs => '10',
:sqlvariant => 'testsql',
:sd_port => '9000',
- :directorpassword => 'testdirectorpass',
+ :directorpassword => 'testdirectorpass'
}
}
@@ -21,7 +21,7 @@
'purge' => 'true',
'mode' => '0444',
'owner' => 'root',
- 'group' => 'bacula',
+ 'group' => 'bacula'
})
end
it 'should generate valid content for /etc/bacula/bacula-sd.conf' do
@@ -29,7 +29,7 @@
'ensure' => 'present',
'owner' => 'root',
'group' => 'root',
- 'mode' => '0400',
+ 'mode' => '0400'
}) \
.with_content(/Name = "testdirector"/) \
.with_content(/Password = "testdirectorpass"/) \
diff --git a/modules/bacula/spec/defines/catalog_spec.rb
b/modules/bacula/spec/defines/catalog_spec.rb
index 4787b31..dfbaa3d 100644
--- a/modules/bacula/spec/defines/catalog_spec.rb
+++ b/modules/bacula/spec/defines/catalog_spec.rb
@@ -7,7 +7,7 @@
:dbuser => 'bacula',
:dbhost => 'bacula-db.example.org',
:dbport => '3306',
- :dbpassword => 'bacula',
+ :dbpassword => 'bacula'
}
}
@@ -16,7 +16,7 @@
'ensure' => 'present',
'owner' => 'root',
'group' => 'bacula',
- 'mode' => '0440',
+ 'mode' => '0440'
}) \
.with_content(/Name = something/) \
.with_content(/dbname = bacula/) \
diff --git a/modules/bacula/spec/defines/fileset_spec.rb
b/modules/bacula/spec/defines/fileset_spec.rb
index f494abe..5deb985 100644
--- a/modules/bacula/spec/defines/fileset_spec.rb
+++ b/modules/bacula/spec/defines/fileset_spec.rb
@@ -2,14 +2,14 @@
describe 'bacula::director::fileset', :type => :define do
let(:title) { 'something' }
- let(:params) { { :includes => [ "/", "/var", ], } }
+ let(:params) { { :includes => [ "/", "/var" ] } }
it 'should create /etc/bacula/conf.d/fileset-something.conf' do
should contain_file('/etc/bacula/conf.d/fileset-something.conf').with({
'ensure' => 'present',
'owner' => 'root',
'group' => 'bacula',
- 'mode' => '0440',
+ 'mode' => '0440'
})
end
@@ -23,8 +23,8 @@
context 'with excludes' do
let(:params) { {
- :includes => [ "/", "/var",],
- :excludes => [ "/tmp", ],
+ :includes => [ "/", "/var"],
+ :excludes => [ "/tmp" ]
}
}
it 'should create valid content for
/etc/bacula/conf.d/fileset-something.conf' do
diff --git a/modules/bacula/spec/defines/job_spec.rb
b/modules/bacula/spec/defines/job_spec.rb
index 58c2e28..4e05480 100644
--- a/modules/bacula/spec/defines/job_spec.rb
+++ b/modules/bacula/spec/defines/job_spec.rb
@@ -4,7 +4,7 @@
let(:title) { 'something' }
let(:params) { {
:fileset => 'root',
- :jobdefaults => 'testdefaults',
+ :jobdefaults => 'testdefaults'
}
}
end
diff --git a/modules/bacula/spec/defines/jobdefaults_spec.rb
b/modules/bacula/spec/defines/jobdefaults_spec.rb
index f9873c1..0a64256 100644
--- a/modules/bacula/spec/defines/jobdefaults_spec.rb
+++ b/modules/bacula/spec/defines/jobdefaults_spec.rb
@@ -4,7 +4,7 @@
let(:title) { 'something' }
let(:params) { {
:when => 'never',
- :pool => 'testpool',
+ :pool => 'testpool'
}
}
@@ -13,7 +13,7 @@
'ensure' => 'present',
'owner' => 'root',
'group' => 'bacula',
- 'mode' => '0440',
+ 'mode' => '0440'
}) \
.with_content(/Name = something/) \
.with_content(/Type = Backup/) \
diff --git a/modules/bacula/spec/defines/mysql-bpipe_spec.rb
b/modules/bacula/spec/defines/mysql-bpipe_spec.rb
index 4e7cdd5..72b1cdf 100644
--- a/modules/bacula/spec/defines/mysql-bpipe_spec.rb
+++ b/modules/bacula/spec/defines/mysql-bpipe_spec.rb
@@ -9,7 +9,7 @@
:xtrabackup => false,
:pigz_level => 'fast',
:is_slave => false,
- :mysqldump_innodb_only => false,
+ :mysqldump_innodb_only => false
}
}
it { should
contain_file('/etc/bacula/scripts/something').with_content(/for database/) }
@@ -21,7 +21,7 @@
:xtrabackup => false,
:pigz_level => 'fast',
:is_slave => false,
- :mysqldump_innodb_only => false,
+ :mysqldump_innodb_only => false
}
}
it { should
contain_file('/etc/bacula/scripts/something').with_content(/alldatabases/) }
@@ -32,7 +32,7 @@
:xtrabackup => true,
:pigz_level => 'fast',
:is_slave => false,
- :mysqldump_innodb_only => false,
+ :mysqldump_innodb_only => false
}
}
it { should
contain_file('/etc/bacula/scripts/something').with_content(/XTRABACKUP/) }
@@ -44,7 +44,7 @@
:xtrabackup => false,
:pigz_level => 'fast',
:is_slave => true,
- :mysqldump_innodb_only => false,
+ :mysqldump_innodb_only => false
}
}
it { should
contain_file('/etc/bacula/scripts/something').with_content(/slave/) }
@@ -56,7 +56,7 @@
:xtrabackup => false,
:pigz_level => 'fast',
:is_slave => false,
- :mysqldump_innodb_only => true,
+ :mysqldump_innodb_only => true
}
}
it { should
contain_file('/etc/bacula/scripts/something').with_content(/single-transcation/)
}
@@ -69,7 +69,7 @@
:pigz_level => 'fast',
:is_slave => false,
:mysqldump_innodb_only => true,
- :local_dump_dir => '/var/backup',
+ :local_dump_dir => '/var/backup'
}
}
it { should
contain_file('/etc/bacula/scripts/something').with_content(/\$TEE
\$LOCALDUMPDIR/) }
@@ -80,7 +80,7 @@
:xtrabackup => false,
:pigz_level => 'fast',
:is_slave => false,
- :mysqldump_innodb_only => true,
+ :mysqldump_innodb_only => true
}
}
it { should
contain_file('/etc/bacula/scripts/something').with_content(/^[\$TEE
\$LOCALDUMPDIR]/) }
diff --git a/modules/bacula/spec/defines/pool_spec.rb
b/modules/bacula/spec/defines/pool_spec.rb
index eb98b8d..4495fc2 100644
--- a/modules/bacula/spec/defines/pool_spec.rb
+++ b/modules/bacula/spec/defines/pool_spec.rb
@@ -5,7 +5,7 @@
let(:params) { {
:max_vols => '10',
:storage => 'teststorage',
- :volume_retention => '10 days',
+ :volume_retention => '10 days'
}
}
@@ -15,7 +15,7 @@
'ensure' => 'present',
'owner' => 'root',
'group' => 'bacula',
- 'mode' => '0440',
+ 'mode' => '0440'
}) \
.with_content(/Name = something/) \
.with_content(/Maximum Volumes = 10/) \
@@ -32,7 +32,7 @@
:max_vols => '10',
:storage => 'teststorage',
:volume_retention => '10 days',
- :max_vol_bytes => '2000',
+ :max_vol_bytes => '2000'
}
}
it 'should create /etc/bacula/conf.d/pool-something.conf' do
@@ -45,7 +45,7 @@
:max_vols => '10',
:storage => 'teststorage',
:volume_retention => '10 days',
- :label_fmt => 'TEST',
+ :label_fmt => 'TEST'
}
}
it 'should create /etc/bacula/conf.d/pool-something.conf' do
diff --git a/modules/bacula/spec/defines/schedule_spec.rb
b/modules/bacula/spec/defines/schedule_spec.rb
index 7db8c82..471e2d6 100644
--- a/modules/bacula/spec/defines/schedule_spec.rb
+++ b/modules/bacula/spec/defines/schedule_spec.rb
@@ -5,7 +5,7 @@
let(:params) { {
:runs => [
{ 'level' => 'Full', 'at' => '1st Sat at 00:00'},
- { 'level' => 'Differential', 'at' => '3rd Sat at 00:00'},
+ { 'level' => 'Differential', 'at' => '3rd Sat at 00:00'}
]
}
}
@@ -15,7 +15,7 @@
'ensure' => 'present',
'owner' => 'root',
'group' => 'bacula',
- 'mode' => '0440',
+ 'mode' => '0440'
}) \
.with_content(/Name = something/) \
.with_content(/Run = Level=Full 1st Sat at 00:00/) \
diff --git a/modules/bacula/spec/defines/storage_device_spec.rb
b/modules/bacula/spec/defines/storage_device_spec.rb
index 8b83ff6..e44656f 100644
--- a/modules/bacula/spec/defines/storage_device_spec.rb
+++ b/modules/bacula/spec/defines/storage_device_spec.rb
@@ -6,7 +6,7 @@
:device_type => 'File',
:media_type => 'File',
:archive_device => '/dev/nst0',
- :max_concur_jobs => '10',
+ :max_concur_jobs => '10'
}
}
@@ -16,7 +16,7 @@
'ensure' => 'present',
'owner' => 'root',
'group' => 'root',
- 'mode' => '0400',
+ 'mode' => '0400'
}) \
.with_content(/Name = something/) \
.with_content(/Device Type = File/) \
@@ -33,7 +33,7 @@
:archive_device => '/dev/nst0',
:max_concur_jobs => '10',
:spool_dir => '/tmp',
- :max_spool_size => '100',
+ :max_spool_size => '100'
}
}
diff --git a/modules/base/Rakefile b/modules/base/Rakefile
index 165b532..a6ae871 100644
--- a/modules/base/Rakefile
+++ b/modules/base/Rakefile
@@ -11,7 +11,7 @@
symlinks = { 'spec/fixtures/modules/%s/files' % modulename =>
'../../../../files',
'spec/fixtures/modules/%s/manifests' % modulename => '../../../../manifests',
- 'spec/fixtures/modules/%s/templates' % modulename => '../../../../templates',
+ 'spec/fixtures/modules/%s/templates' % modulename => '../../../../templates'
}
diff --git a/modules/git/spec/defines/user_spec.rb
b/modules/git/spec/defines/user_spec.rb
index 468ffba..e0fad7c 100644
--- a/modules/git/spec/defines/user_spec.rb
+++ b/modules/git/spec/defines/user_spec.rb
@@ -16,7 +16,7 @@
:settings => {
'user' => {
'name' => 'Antoine Musso',
- 'email' => 'has...@free.fr',
+ 'email' => 'has...@free.fr'
}
} }
}
diff --git a/modules/install_server/Rakefile b/modules/install_server/Rakefile
index 0e38911..0aa1f5c 100644
--- a/modules/install_server/Rakefile
+++ b/modules/install_server/Rakefile
@@ -11,7 +11,7 @@
symlinks = { 'spec/fixtures/modules/%s/files' % modulename =>
'../../../../files',
'spec/fixtures/modules/%s/manifests' % modulename => '../../../../manifests',
- 'spec/fixtures/modules/%s/templates' % modulename => '../../../../templates',
+ 'spec/fixtures/modules/%s/templates' % modulename => '../../../../templates'
}
diff --git
a/modules/install_server/spec/classes/install_server_apt_repository_spec.rb
b/modules/install_server/spec/classes/install_server_apt_repository_spec.rb
index 275bbc5..d1c3f0e 100644
--- a/modules/install_server/spec/classes/install_server_apt_repository_spec.rb
+++ b/modules/install_server/spec/classes/install_server_apt_repository_spec.rb
@@ -12,7 +12,7 @@
'ensure' => 'directory',
'mode' => '0755',
'owner' => 'root',
- 'group' => 'root',
+ 'group' => 'root'
})
end
@@ -21,7 +21,7 @@
'ensure' => 'directory',
'mode' => '0755',
'owner' => 'root',
- 'group' => 'root',
+ 'group' => 'root'
})
end
@@ -30,7 +30,7 @@
'ensure' => 'present',
'mode' => '0755',
'owner' => 'root',
- 'group' => 'root',
+ 'group' => 'root'
})
end
@@ -39,7 +39,7 @@
'ensure' => 'present',
'mode' => '0444',
'owner' => 'root',
- 'group' => 'root',
+ 'group' => 'root'
})
end
@@ -48,7 +48,7 @@
'ensure' => 'present',
'mode' => '0444',
'owner' => 'root',
- 'group' => 'root',
+ 'group' => 'root'
})
end
@@ -57,7 +57,7 @@
'ensure' => 'present',
'mode' => '0444',
'owner' => 'root',
- 'group' => 'root',
+ 'group' => 'root'
})
end
end
diff --git
a/modules/install_server/spec/classes/install_server_dhcp_server_spec.rb
b/modules/install_server/spec/classes/install_server_dhcp_server_spec.rb
index 661f429..22a8ff9 100644
--- a/modules/install_server/spec/classes/install_server_dhcp_server_spec.rb
+++ b/modules/install_server/spec/classes/install_server_dhcp_server_spec.rb
@@ -10,7 +10,7 @@
'mode' => '0444',
'owner' => 'root',
'group' => 'root',
- 'recurse' => 'true',
+ 'recurse' => 'true'
})
end
end
diff --git
a/modules/install_server/spec/classes/install_server_preseed_server_spec.rb
b/modules/install_server/spec/classes/install_server_preseed_server_spec.rb
index dd4a332..af7c0ce 100644
--- a/modules/install_server/spec/classes/install_server_preseed_server_spec.rb
+++ b/modules/install_server/spec/classes/install_server_preseed_server_spec.rb
@@ -9,7 +9,7 @@
'owner' => 'root',
'group' => 'root',
'recurse' => 'true',
- 'links' => 'manage',
+ 'links' => 'manage'
}).without_path()
end
end
diff --git
a/modules/install_server/spec/classes/install_server_tftp_server_spec.rb
b/modules/install_server/spec/classes/install_server_tftp_server_spec.rb
index ee22a32..d9d0597 100644
--- a/modules/install_server/spec/classes/install_server_tftp_server_spec.rb
+++ b/modules/install_server/spec/classes/install_server_tftp_server_spec.rb
@@ -8,7 +8,7 @@
should contain_file('/etc/default/atftpd').with({
'mode' => '0444',
'owner' => 'root',
- 'group' => 'root',
+ 'group' => 'root'
})
end
@@ -17,7 +17,7 @@
'mode' => '0444',
'owner' => 'root',
'group' => 'root',
- 'recurse' => 'remote',
+ 'recurse' => 'remote'
})
end
end
diff --git
a/modules/install_server/spec/classes/install_server_web_server_spec.rb
b/modules/install_server/spec/classes/install_server_web_server_spec.rb
index 2210b92..7f7a09c 100644
--- a/modules/install_server/spec/classes/install_server_web_server_spec.rb
+++ b/modules/install_server/spec/classes/install_server_web_server_spec.rb
@@ -6,7 +6,7 @@
'mode' => '0444',
'owner' => 'root',
'group' => 'root',
- 'content' => '',
+ 'content' => ''
})
end
end
diff --git a/modules/mirrors/Rakefile b/modules/mirrors/Rakefile
index 0e38911..0aa1f5c 100644
--- a/modules/mirrors/Rakefile
+++ b/modules/mirrors/Rakefile
@@ -11,7 +11,7 @@
symlinks = { 'spec/fixtures/modules/%s/files' % modulename =>
'../../../../files',
'spec/fixtures/modules/%s/manifests' % modulename => '../../../../manifests',
- 'spec/fixtures/modules/%s/templates' % modulename => '../../../../templates',
+ 'spec/fixtures/modules/%s/templates' % modulename => '../../../../templates'
}
diff --git a/modules/mirrors/spec/classes/mirrors_debian_spec.rb
b/modules/mirrors/spec/classes/mirrors_debian_spec.rb
index cec942d..d8e73e1 100644
--- a/modules/mirrors/spec/classes/mirrors_debian_spec.rb
+++ b/modules/mirrors/spec/classes/mirrors_debian_spec.rb
@@ -7,7 +7,7 @@
'ensure' => 'directory',
'owner' => 'mirror',
'group' => 'mirror',
- 'mode' => '0755',
+ 'mode' => '0755'
})
end
it do
@@ -16,7 +16,7 @@
'owner' => 'mirror',
'group' => 'mirror',
'mode' => '0755',
- 'source' => 'puppet:///modules/mirrors/archvsync',
+ 'source' => 'puppet:///modules/mirrors/archvsync'
})
end
it do
@@ -25,7 +25,7 @@
'owner' => 'mirror',
'group' => 'mirror',
'mode' => '0555',
- 'source' => 'puppet:///modules/mirrors/ftpsync.conf',
+ 'source' => 'puppet:///modules/mirrors/ftpsync.conf'
})
end
it do
@@ -34,7 +34,7 @@
'command' => '/var/lib/mirror/archvsync/bin/ftpsync',
'user' => 'mirror',
'hour' => '*/6',
- 'minute' => '03',
+ 'minute' => '03'
})
end
end
diff --git a/modules/mirrors/spec/classes/mirrors_spec.rb
b/modules/mirrors/spec/classes/mirrors_spec.rb
index c9a55be..aaf68dd 100644
--- a/modules/mirrors/spec/classes/mirrors_spec.rb
+++ b/modules/mirrors/spec/classes/mirrors_spec.rb
@@ -11,7 +11,7 @@
'ensure' => 'present',
'owner' => 'root',
'group' => 'root',
- 'mode' => '0555',
+ 'mode' => '0555'
})
end
end
diff --git a/modules/mirrors/spec/classes/mirrors_ubuntu_spec.rb
b/modules/mirrors/spec/classes/mirrors_ubuntu_spec.rb
index f20c6e0..fed41e6 100644
--- a/modules/mirrors/spec/classes/mirrors_ubuntu_spec.rb
+++ b/modules/mirrors/spec/classes/mirrors_ubuntu_spec.rb
@@ -7,7 +7,7 @@
'ensure' => 'directory',
'owner' => 'mirror',
'group' => 'mirror',
- 'mode' => '0755',
+ 'mode' => '0755'
})
end
it do
@@ -16,7 +16,7 @@
'owner' => 'root',
'group' => 'root',
'mode' => '0555',
- 'source' => 'puppet:///modules/mirrors/update-ubuntu-mirror',
+ 'source' => 'puppet:///modules/mirrors/update-ubuntu-mirror'
})
end
it do
@@ -25,7 +25,7 @@
'command' => '/usr/local/sbin/update-ubuntu-mirror 1>/dev/null
2>/var/lib/mirror/mirror.err.log',
'user' => 'mirror',
'hour' => '*/6',
- 'minute' => '43',
+ 'minute' => '43'
})
end
end
diff --git a/modules/nrpe/Rakefile b/modules/nrpe/Rakefile
index d9226a8..798a17c 100644
--- a/modules/nrpe/Rakefile
+++ b/modules/nrpe/Rakefile
@@ -7,7 +7,7 @@
symlinks = { 'spec/fixtures/modules/%s/files' % modulename =>
'../../../../files',
'spec/fixtures/modules/%s/manifests' % modulename => '../../../../manifests',
- 'spec/fixtures/modules/%s/templates' % modulename => '../../../../templates',
+ 'spec/fixtures/modules/%s/templates' % modulename => '../../../../templates'
}
diff --git a/modules/nrpe/spec/defines/monitor_service_spec.rb
b/modules/nrpe/spec/defines/monitor_service_spec.rb
index 181d6ba..4644cd7 100644
--- a/modules/nrpe/spec/defines/monitor_service_spec.rb
+++ b/modules/nrpe/spec/defines/monitor_service_spec.rb
@@ -6,7 +6,7 @@
:description => 'this is a description',
:contact_group => 'none',
:nrpe_command => '/usr/local/bin/mycommand -i this -o that',
- :critical => 'false',
+ :critical => 'false'
}
end
diff --git a/modules/osm/Rakefile b/modules/osm/Rakefile
index d9226a8..798a17c 100644
--- a/modules/osm/Rakefile
+++ b/modules/osm/Rakefile
@@ -7,7 +7,7 @@
symlinks = { 'spec/fixtures/modules/%s/files' % modulename =>
'../../../../files',
'spec/fixtures/modules/%s/manifests' % modulename => '../../../../manifests',
- 'spec/fixtures/modules/%s/templates' % modulename => '../../../../templates',
+ 'spec/fixtures/modules/%s/templates' % modulename => '../../../../templates'
}
diff --git a/modules/osm/spec/classes/osm_spec.rb
b/modules/osm/spec/classes/osm_spec.rb
index a58f4c3..7610a1f 100644
--- a/modules/osm/spec/classes/osm_spec.rb
+++ b/modules/osm/spec/classes/osm_spec.rb
@@ -2,7 +2,7 @@
describe 'osm', :type => :class do
let(:params) { {
- :ensure => 'present',
+ :ensure => 'present'
}
}
@@ -14,7 +14,7 @@
describe 'osm', :type => :class do
let(:params) { {
- :ensure => 'absent',
+ :ensure => 'absent'
}
}
diff --git a/modules/osm/spec/defines/osm_planet_import_spec.rb
b/modules/osm/spec/defines/osm_planet_import_spec.rb
index 87a7304..f87ac95 100644
--- a/modules/osm/spec/defines/osm_planet_import_spec.rb
+++ b/modules/osm/spec/defines/osm_planet_import_spec.rb
@@ -3,11 +3,11 @@
describe 'osm::planet_import', :type => :define do
let(:title) { 'somedb' }
let(:facts) { {
- :memoryfree => '1000 MB',
+ :memoryfree => '1000 MB'
}
}
let(:params) { {
- :input_pbf_file => '/nonexistent',
+ :input_pbf_file => '/nonexistent'
}
}
context 'with ensure present' do
diff --git a/modules/osm/spec/defines/osm_planet_sync_spec.rb
b/modules/osm/spec/defines/osm_planet_sync_spec.rb
index a669991..eddafc1 100644
--- a/modules/osm/spec/defines/osm_planet_sync_spec.rb
+++ b/modules/osm/spec/defines/osm_planet_sync_spec.rb
@@ -3,12 +3,12 @@
describe 'osm::planet_sync', :type => :define do
let(:title) { 'somedb' }
let(:facts) { {
- :memoryfree => '1000 MB',
+ :memoryfree => '1000 MB'
}
}
let(:params) { {
:osmosis_dir => '/srv/osmosis',
- :period => 'minute',
+ :period => 'minute'
}
}
context 'with ensure present' do
diff --git a/modules/osm/spec/defines/osm_shapefile_import_spec.rb
b/modules/osm/spec/defines/osm_shapefile_import_spec.rb
index 8be03ad..59e668b 100644
--- a/modules/osm/spec/defines/osm_shapefile_import_spec.rb
+++ b/modules/osm/spec/defines/osm_shapefile_import_spec.rb
@@ -5,7 +5,7 @@
let(:params) { {
:database => 'gis',
:input_shape_file => '/nonexistent',
- :shape_table => 'shapes',
+ :shape_table => 'shapes'
}
}
context 'with ensure present' do
diff --git a/modules/osm/spec/defines/osm_usergrants_spec.rb
b/modules/osm/spec/defines/osm_usergrants_spec.rb
index 3430159..26ea877 100644
--- a/modules/osm/spec/defines/osm_usergrants_spec.rb
+++ b/modules/osm/spec/defines/osm_usergrants_spec.rb
@@ -4,7 +4,7 @@
let(:title) { 'somedb' }
let(:params) { {
:postgresql_user => 'someuser',
- :ensure => 'present',
+ :ensure => 'present'
}
}
context 'with ensure present' do
@@ -16,7 +16,7 @@
let(:title) { 'somedb' }
let(:params) { {
:postgresql_user => 'someuser',
- :ensure => 'absent',
+ :ensure => 'absent'
}
}
context 'with ensure absent' do
diff --git a/modules/postgresql/Rakefile b/modules/postgresql/Rakefile
index d9226a8..798a17c 100644
--- a/modules/postgresql/Rakefile
+++ b/modules/postgresql/Rakefile
@@ -7,7 +7,7 @@
symlinks = { 'spec/fixtures/modules/%s/files' % modulename =>
'../../../../files',
'spec/fixtures/modules/%s/manifests' % modulename => '../../../../manifests',
- 'spec/fixtures/modules/%s/templates' % modulename => '../../../../templates',
+ 'spec/fixtures/modules/%s/templates' % modulename => '../../../../templates'
}
diff --git a/modules/postgresql/spec/classes/postgresql_ganglia.rb
b/modules/postgresql/spec/classes/postgresql_ganglia.rb
index 9f26c30..5abc931 100644
--- a/modules/postgresql/spec/classes/postgresql_ganglia.rb
+++ b/modules/postgresql/spec/classes/postgresql_ganglia.rb
@@ -2,7 +2,7 @@
describe 'postgresql::ganglia', :type => :class do
let(:params) { {
- :ensure => 'present',
+ :ensure => 'present'
}
}
@@ -14,7 +14,7 @@
describe 'postgresql::slave', :type => :class do
let(:params) { {
- :ensure => 'absent',
+ :ensure => 'absent'
}
}
diff --git a/modules/postgresql/spec/classes/postgresql_master_spec.rb
b/modules/postgresql/spec/classes/postgresql_master_spec.rb
index a4b0157..b43f2cb 100644
--- a/modules/postgresql/spec/classes/postgresql_master_spec.rb
+++ b/modules/postgresql/spec/classes/postgresql_master_spec.rb
@@ -4,7 +4,7 @@
let(:params) { {
:pgversion => '9.1',
:ensure => 'present',
- :master_server => 'test',
+ :master_server => 'test'
}
}
@@ -29,7 +29,7 @@
let(:params) { {
:pgversion => '9.1',
:ensure => 'absent',
- :master_server => 'test',
+ :master_server => 'test'
}
}
diff --git a/modules/postgresql/spec/classes/postgresql_postgis_spec.rb
b/modules/postgresql/spec/classes/postgresql_postgis_spec.rb
index aca9d8b..bb171ad 100644
--- a/modules/postgresql/spec/classes/postgresql_postgis_spec.rb
+++ b/modules/postgresql/spec/classes/postgresql_postgis_spec.rb
@@ -3,7 +3,7 @@
describe 'postgresql::postgis', :type => :class do
let(:params) { {
:pgversion => '9.1',
- :ensure => 'present',
+ :ensure => 'present'
}
}
@@ -15,7 +15,7 @@
describe 'postgresql::postgis', :type => :class do
let(:params) { {
:pgversion => '9.1',
- :ensure => 'absent',
+ :ensure => 'absent'
}
}
diff --git a/modules/postgresql/spec/classes/postgresql_server_spec.rb
b/modules/postgresql/spec/classes/postgresql_server_spec.rb
index 18a25d4..55fec06 100644
--- a/modules/postgresql/spec/classes/postgresql_server_spec.rb
+++ b/modules/postgresql/spec/classes/postgresql_server_spec.rb
@@ -3,7 +3,7 @@
describe 'postgresql::server', :type => :class do
let(:params) { {
:pgversion => '9.1',
- :ensure => 'present',
+ :ensure => 'present'
}
}
@@ -17,7 +17,7 @@
it { should
contain_file('/etc/postgresql/9.1/main/postgresql.conf').with_ensure('present')
}
it do
should contain_service('postgresql').with({
- 'ensure' => 'running',
+ 'ensure' => 'running'
})
end
end
@@ -26,7 +26,7 @@
describe 'postgresql::server', :type => :class do
let(:params) { {
:pgversion => '9.1',
- :ensure => 'absent',
+ :ensure => 'absent'
}
}
@@ -39,7 +39,7 @@
it { should
contain_file('/etc/postgresql/9.1/main/postgresql.conf').with_ensure('absent') }
it do
should contain_service('postgresql').with({
- 'ensure' => 'stopped',
+ 'ensure' => 'stopped'
})
end
end
@@ -49,7 +49,7 @@
let(:params) { {
:pgversion => '9.1',
:ensure => 'absent',
- :includes => ['a.conf', 'b.conf'],
+ :includes => ['a.conf', 'b.conf']
}
}
diff --git a/modules/postgresql/spec/classes/postgresql_slave_spec.rb
b/modules/postgresql/spec/classes/postgresql_slave_spec.rb
index 283143c..5a12fc4 100644
--- a/modules/postgresql/spec/classes/postgresql_slave_spec.rb
+++ b/modules/postgresql/spec/classes/postgresql_slave_spec.rb
@@ -5,7 +5,7 @@
:pgversion => '9.1',
:ensure => 'present',
:master_server => 'test',
- :replication_pass => 'pass',
+ :replication_pass => 'pass'
}
}
@@ -32,7 +32,7 @@
:ensure => 'present',
:master_server => 'test',
:replication_pass => 'pass',
- :datadir => '/srv/postgres/9.1/main',
+ :datadir => '/srv/postgres/9.1/main'
}
}
context 'ensure present' do
@@ -57,7 +57,7 @@
:pgversion => '9.1',
:ensure => 'absent',
:master_server => 'test',
- :replication_pass => 'pass',
+ :replication_pass => 'pass'
}
}
diff --git a/modules/postgresql/spec/defines/postgresql_spatial_db_spec.rb
b/modules/postgresql/spec/defines/postgresql_spatial_db_spec.rb
index 8e49e10..e2295fa 100644
--- a/modules/postgresql/spec/defines/postgresql_spatial_db_spec.rb
+++ b/modules/postgresql/spec/defines/postgresql_spatial_db_spec.rb
@@ -3,7 +3,7 @@
describe 'postgresql::spatialdb', :type => :define do
let(:title) { 'somedb' }
let(:params) { {
- :ensure => 'present',
+ :ensure => 'present'
}
}
context 'with ensure present' do
@@ -19,7 +19,7 @@
describe 'postgresql::spatialdb', :type => :define do
let(:title) { 'somedb' }
let(:params) { {
- :ensure => 'absent',
+ :ensure => 'absent'
}
}
context 'with ensure absent' do
diff --git a/modules/postgresql/spec/defines/postgresql_user_spec.rb
b/modules/postgresql/spec/defines/postgresql_user_spec.rb
index 99c3e67..1fc5031 100644
--- a/modules/postgresql/spec/defines/postgresql_user_spec.rb
+++ b/modules/postgresql/spec/defines/postgresql_user_spec.rb
@@ -5,7 +5,7 @@
let(:params) { {
:user => 'something',
:password => 'soemthing',
- :ensure => 'present',
+ :ensure => 'present'
}
}
context 'with ensure present' do
@@ -20,7 +20,7 @@
let(:params) { {
:user => 'something',
:password => 'soemthing',
- :ensure => 'absent',
+ :ensure => 'absent'
}
}
diff --git a/modules/puppetmaster/lib/puppet/reports/logstash.rb
b/modules/puppetmaster/lib/puppet/reports/logstash.rb
index 43ca5ab..8a85c52 100644
--- a/modules/puppetmaster/lib/puppet/reports/logstash.rb
+++ b/modules/puppetmaster/lib/puppet/reports/logstash.rb
@@ -44,7 +44,7 @@
'start_time' => self.logs.first.time.utc.iso8601,
'end_time' => self.logs.last.time.utc.iso8601,
'log_messages' => self.logs.map(&:to_report),
- 'metrics' => {},
+ 'metrics' => {}
}
self.metrics.each do |category,v|
diff --git a/modules/servermon/Rakefile b/modules/servermon/Rakefile
index 165b532..a6ae871 100644
--- a/modules/servermon/Rakefile
+++ b/modules/servermon/Rakefile
@@ -11,7 +11,7 @@
symlinks = { 'spec/fixtures/modules/%s/files' % modulename =>
'../../../../files',
'spec/fixtures/modules/%s/manifests' % modulename => '../../../../manifests',
- 'spec/fixtures/modules/%s/templates' % modulename => '../../../../templates',
+ 'spec/fixtures/modules/%s/templates' % modulename => '../../../../templates'
}
diff --git a/modules/squid3/Rakefile b/modules/squid3/Rakefile
index 6f78f76..dd82730 100644
--- a/modules/squid3/Rakefile
+++ b/modules/squid3/Rakefile
@@ -9,7 +9,7 @@
symlinks = { 'spec/fixtures/modules/%s/files' % modulename =>
'../../../../files',
'spec/fixtures/modules/%s/manifests' % modulename => '../../../../manifests',
- 'spec/fixtures/modules/%s/templates' % modulename => '../../../../templates',
+ 'spec/fixtures/modules/%s/templates' % modulename => '../../../../templates'
}
diff --git a/modules/squid3/spec/classes/squid3_spec.rb
b/modules/squid3/spec/classes/squid3_spec.rb
index ff0bab7..7f15a6c 100644
--- a/modules/squid3/spec/classes/squid3_spec.rb
+++ b/modules/squid3/spec/classes/squid3_spec.rb
@@ -9,14 +9,14 @@
'ensure' => 'present',
'mode' => '0444',
'owner' => 'root',
- 'group' => 'root',
+ 'group' => 'root'
}).without_path()
should contain_file('/etc/logrotate.d/squid3').with({
'ensure' => 'present',
'mode' => '0444',
'owner' => 'root',
- 'group' => 'root',
+ 'group' => 'root'
}).without_path()
end
end
diff --git a/modules/strongswan/Rakefile b/modules/strongswan/Rakefile
index a0c3b79..836ce91 100644
--- a/modules/strongswan/Rakefile
+++ b/modules/strongswan/Rakefile
@@ -7,7 +7,7 @@
symlinks = { 'spec/fixtures/modules/%s/files' % modulename =>
'../../../../files',
'spec/fixtures/modules/%s/manifests' % modulename =>
'../../../../manifests',
- 'spec/fixtures/modules/%s/templates' % modulename =>
'../../../../templates',
+ 'spec/fixtures/modules/%s/templates' % modulename =>
'../../../../templates'
}
diff --git a/modules/wmflib/Rakefile b/modules/wmflib/Rakefile
index a0c3b79..836ce91 100644
--- a/modules/wmflib/Rakefile
+++ b/modules/wmflib/Rakefile
@@ -7,7 +7,7 @@
symlinks = { 'spec/fixtures/modules/%s/files' % modulename =>
'../../../../files',
'spec/fixtures/modules/%s/manifests' % modulename =>
'../../../../manifests',
- 'spec/fixtures/modules/%s/templates' % modulename =>
'../../../../templates',
+ 'spec/fixtures/modules/%s/templates' % modulename =>
'../../../../templates'
}
diff --git a/modules/wmflib/lib/puppet/parser/functions/os_version.rb
b/modules/wmflib/lib/puppet/parser/functions/os_version.rb
index 2b91a4d..28be3ef 100644
--- a/modules/wmflib/lib/puppet/parser/functions/os_version.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/os_version.rb
@@ -39,13 +39,13 @@
'Trusty' => '14.04',
'Utopic' => '14.10',
'Vivid' => '15.04',
- 'Wily' => '15.10',
+ 'Wily' => '15.10'
},
'Debian' => {
'Wheezy' => '7',
'Jessie' => '8',
'Stretch' => '9',
- 'Buster' => '10',
+ 'Buster' => '10'
}
}
diff --git a/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
b/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
index 709e906..2140667 100644
--- a/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
@@ -83,7 +83,7 @@
'DHE-RSA-AES128-GCM-SHA256',
'ECDHE-ECDSA-AES256-GCM-SHA384',
'ECDHE-RSA-AES256-GCM-SHA384',
- 'DHE-RSA-AES256-GCM-SHA384',
+ 'DHE-RSA-AES256-GCM-SHA384'
],
# Forward-Secret, but not AEAD
'mid' => [
@@ -100,7 +100,7 @@
'DHE-RSA-AES256-SHA256',
'DHE-RSA-AES256-SHA',
'DHE-RSA-CAMELLIA128-SHA',
- 'DHE-RSA-CAMELLIA256-SHA',
+ 'DHE-RSA-CAMELLIA256-SHA'
],
# not-forward-secret compat for ancient stuff
'compat' => [
@@ -111,14 +111,14 @@
'AES256-SHA256',
'AES256-SHA',
'DES-CBC3-SHA', # Only for IE8/XP at this point, I think
- ],
+ ]
}
# Final lists exposed to callers
ciphersuites = {
'strong' => basic['strong'],
'mid' => basic['strong'] + basic['mid'],
- 'compat' => basic['strong'] + basic['mid'] + basic['compat'],
+ 'compat' => basic['strong'] + basic['mid'] + basic['compat']
}
newfunction(
--
To view, visit https://gerrit.wikimedia.org/r/238779
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a7b6e9d5a94525770dc0ea9db843a556dea7577
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Zfilipin <zfili...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
