Juniorsys has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332105 )
Change subject: puppetmaster module: Linting changes
......................................................................
puppetmaster module: Linting changes
Use full names for class names, as relative names are not allowed in
future Puppet versions
Add trailing commas to abide by the Coding Style guidelines
Bug: T93645
Change-Id: I6087086c2c14de27a53da57d5f220abc1f6e689f
---
M modules/puppetmaster/manifests/certmanager.pp
M modules/puppetmaster/manifests/generators.pp
M modules/puppetmaster/manifests/geoip.pp
M modules/puppetmaster/manifests/gitclone.pp
M modules/puppetmaster/manifests/gitprivate.pp
M modules/puppetmaster/manifests/gitsync.pp
M modules/puppetmaster/manifests/hiera.pp
M modules/puppetmaster/manifests/init.pp
M modules/puppetmaster/manifests/labsrootpass.pp
M modules/puppetmaster/manifests/passenger.pp
M modules/puppetmaster/manifests/puppetdb.pp
M modules/puppetmaster/manifests/puppetdb/database.pp
M modules/puppetmaster/manifests/scripts.pp
M modules/puppetmaster/manifests/ssl.pp
M modules/puppetmaster/tests/geoip.pp
M modules/puppetmaster/tests/gitpuppet.pp
M modules/puppetmaster/tests/labs.pp
M modules/puppetmaster/tests/puppetmaster.pp
M modules/puppetmaster/tests/scripts.pp
M modules/puppetmaster/tests/ssl.pp
20 files changed, 50 insertions(+), 50 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/05/332105/1
diff --git a/modules/puppetmaster/manifests/certmanager.pp
b/modules/puppetmaster/manifests/certmanager.pp
index 4cf70a6..7c6e4be 100644
--- a/modules/puppetmaster/manifests/certmanager.pp
+++ b/modules/puppetmaster/manifests/certmanager.pp
@@ -15,7 +15,7 @@
sudo::user { 'certmanager':
privileges => [
'ALL = (root) NOPASSWD: /usr/bin/puppet cert clean *',
- 'ALL = (root) NOPASSWD: /usr/bin/salt-key -y -d *'
- ]
+ 'ALL = (root) NOPASSWD: /usr/bin/salt-key -y -d *',
+ ],
}
}
diff --git a/modules/puppetmaster/manifests/generators.pp
b/modules/puppetmaster/manifests/generators.pp
index 30943cb..c0461c2 100644
--- a/modules/puppetmaster/manifests/generators.pp
+++ b/modules/puppetmaster/manifests/generators.pp
@@ -9,7 +9,7 @@
group => 'root',
mode => '0555',
source => 'puppet:///modules/puppetmaster/naggen2',
- require => Package[$packages]
+ require => Package[$packages],
}
file {'/usr/local/bin/sshknowngen':
@@ -18,7 +18,7 @@
group => 'root',
mode => '0555',
source => 'puppet:///modules/puppetmaster/sshknowngen',
- require => Package[$packages]
+ require => Package[$packages],
}
file {'/usr/local/bin/prometheus-ganglia-gen':
@@ -27,6 +27,6 @@
group => 'root',
mode => '0555',
source => 'puppet:///modules/puppetmaster/prometheus-ganglia-gen',
- require => Package[$packages]
+ require => Package[$packages],
}
}
diff --git a/modules/puppetmaster/manifests/geoip.pp
b/modules/puppetmaster/manifests/geoip.pp
index 5dbd2d2..f025540 100644
--- a/modules/puppetmaster/manifests/geoip.pp
+++ b/modules/puppetmaster/manifests/geoip.pp
@@ -21,9 +21,9 @@
if $fetch_private {
# Fetch the proprietary paid-for MaxMind database
- include passwords::geoip
+ include ::passwords::geoip
- class { 'geoip::data::maxmind':
+ class { '::geoip::data::maxmind':
data_directory => $geoip_destdir,
proxy => $webproxy,
user_id => $passwords::geoip::user_id,
@@ -41,7 +41,7 @@
],
}
} else {
- class { 'geoip::data::maxmind':
+ class { '::geoip::data::maxmind':
data_directory => $geoip_destdir,
proxy => $webproxy,
product_ids => [
diff --git a/modules/puppetmaster/manifests/gitclone.pp
b/modules/puppetmaster/manifests/gitclone.pp
index 4b900a2..3f346e5 100644
--- a/modules/puppetmaster/manifests/gitclone.pp
+++ b/modules/puppetmaster/manifests/gitclone.pp
@@ -156,14 +156,14 @@
owner => $user,
group => $group,
mode => '0550',
- require => File['/srv/private']
+ require => File['/srv/private'],
}
file { '/srv/private/.git/config':
source =>
'puppet:///modules/puppetmaster/git/private/gitconfig-master',
owner => $user,
group => $group,
mode => '0550',
- require => File['/srv/private']
+ require => File['/srv/private'],
}
} else {
puppetmaster::gitprivate { '/srv/private':
@@ -179,7 +179,7 @@
owner => $user,
group => $group,
mode => '0550',
- require => Puppetmaster::Gitprivate['/srv/private']
+ require => Puppetmaster::Gitprivate['/srv/private'],
}
}
diff --git a/modules/puppetmaster/manifests/gitprivate.pp
b/modules/puppetmaster/manifests/gitprivate.pp
index 5e9149c..d69f665 100644
--- a/modules/puppetmaster/manifests/gitprivate.pp
+++ b/modules/puppetmaster/manifests/gitprivate.pp
@@ -42,7 +42,7 @@
group => $group,
cwd => $title,
creates => $creates,
- require => File[$title]
+ require => File[$title],
}
}
diff --git a/modules/puppetmaster/manifests/gitsync.pp
b/modules/puppetmaster/manifests/gitsync.pp
index 2cc2265..d1e987f 100644
--- a/modules/puppetmaster/manifests/gitsync.pp
+++ b/modules/puppetmaster/manifests/gitsync.pp
@@ -32,12 +32,12 @@
sudo::user { 'cherry_pick_count':
ensure => present,
user => 'diamond',
- privileges => [ 'ALL = (root) NOPASSWD: /usr/bin/git
--git-dir=/var/lib/git/operations/puppet/.git log --pretty=oneline
--abbrev-commit origin/HEAD..HEAD' ]
+ privileges => [ 'ALL = (root) NOPASSWD: /usr/bin/git
--git-dir=/var/lib/git/operations/puppet/.git log --pretty=oneline
--abbrev-commit origin/HEAD..HEAD' ],
}
diamond::collector { 'CherryPickCounter':
ensure => present,
source =>
'puppet:///modules/puppetmaster/cherry-pick-counter-collector.py',
- require => Sudo::User['cherry_pick_count']
+ require => Sudo::User['cherry_pick_count'],
}
}
diff --git a/modules/puppetmaster/manifests/hiera.pp
b/modules/puppetmaster/manifests/hiera.pp
index 928f6bd..c9d745e 100644
--- a/modules/puppetmaster/manifests/hiera.pp
+++ b/modules/puppetmaster/manifests/hiera.pp
@@ -19,7 +19,7 @@
group => 'root',
mode => '0444',
source => $source,
- require => Package['puppetmaster-common']
+ require => Package['puppetmaster-common'],
}
# We don't need to declare ruby-hiera as a package explicitly as
# puppetmaster-common depends on ruby-hiera.
diff --git a/modules/puppetmaster/manifests/init.pp
b/modules/puppetmaster/manifests/init.pp
index d9d5e0b..15d14b1 100644
--- a/modules/puppetmaster/manifests/init.pp
+++ b/modules/puppetmaster/manifests/init.pp
@@ -66,7 +66,7 @@
# Require /etc/puppet.conf to be in place,
# so the postinst scripts do the right things.
- class { 'puppetmaster::config':
+ class { '::puppetmaster::config':
config => $config,
server_type => $server_type,
}
@@ -96,7 +96,7 @@
'rails',
'ruby-json',
'ruby-mysql',
- 'ruby-ldap'
+ 'ruby-ldap',
]:
ensure => present,
}
@@ -108,11 +108,11 @@
}
}
- class { 'puppetmaster::passenger':
+ class { '::puppetmaster::passenger':
bind_address => $bind_address,
verify_client => $verify_client,
allow_from => $allow_from,
- deny_from => $deny_from
+ deny_from => $deny_from,
}
@@ -146,11 +146,11 @@
}
}
- class { 'puppetmaster::ssl':
+ class { '::puppetmaster::ssl':
server_name => $server_name,
}
- class { 'puppetmaster::gitclone':
+ class { '::puppetmaster::gitclone':
secure_private => $secure_private,
is_git_master => $is_git_master,
prevent_cherrypicks => $prevent_cherrypicks,
@@ -158,11 +158,11 @@
group => $git_group,
}
- include puppetmaster::scripts
- include puppetmaster::geoip
- include puppetmaster::gitpuppet
- include puppetmaster::monitoring
- include puppetmaster::generators
+ include ::puppetmaster::scripts
+ include ::puppetmaster::geoip
+ include ::puppetmaster::gitpuppet
+ include ::puppetmaster::monitoring
+ include ::puppetmaster::generators
file { '/etc/puppet/auth.conf':
owner => 'root',
diff --git a/modules/puppetmaster/manifests/labsrootpass.pp
b/modules/puppetmaster/manifests/labsrootpass.pp
index d8acfce..414b4b1 100644
--- a/modules/puppetmaster/manifests/labsrootpass.pp
+++ b/modules/puppetmaster/manifests/labsrootpass.pp
@@ -19,7 +19,7 @@
owner => 'root',
group => 'root',
mode => '0555',
- source => 'puppet:///modules/puppetmaster/make-labs-root-password'
+ source => 'puppet:///modules/puppetmaster/make-labs-root-password',
}
file { '/var/local/labs-root-passwords':
diff --git a/modules/puppetmaster/manifests/passenger.pp
b/modules/puppetmaster/manifests/passenger.pp
index c2a78fa..2d1ec11 100644
--- a/modules/puppetmaster/manifests/passenger.pp
+++ b/modules/puppetmaster/manifests/passenger.pp
@@ -28,7 +28,7 @@
# Jessie-specific instructions
if os_version('Debian >= jessie') {
# Debian jessie needs the DH params file
- include sslcert::dhparam
+ include ::sslcert::dhparam
# Set a unicode capable locale to avoid "SERVER: invalid byte sequence
in
# US-ASCII" errors when puppetmaster is started with LANG that doesn't
@@ -37,7 +37,7 @@
apache::env { 'use-utf-locale':
ensure => present,
vars => {
- 'LANG' => 'en_US.UTF-8'
+ 'LANG' => 'en_US.UTF-8',
},
}
}
diff --git a/modules/puppetmaster/manifests/puppetdb.pp
b/modules/puppetmaster/manifests/puppetdb.pp
index ce7b75a..de2b5cb 100644
--- a/modules/puppetmaster/manifests/puppetdb.pp
+++ b/modules/puppetmaster/manifests/puppetdb.pp
@@ -19,7 +19,7 @@
::nginx::site { 'puppetdb':
ensure => present,
content => template('puppetmaster/nginx-puppetdb.conf.erb'),
- require => Class['::sslcert::dhparam']
+ require => Class['::sslcert::dhparam'],
}
diamond::collector::nginx{ $::fqdn:
@@ -41,7 +41,7 @@
group => 'root',
mode => '0750',
recurse => true,
- require => Package['puppetdb']
+ require => Package['puppetdb'],
}
# Ensure the default debian config file is not there
@@ -88,7 +88,7 @@
}
)
puppetmaster::puppetdb::config { 'read-database':
- settings => $read_db_settings
+ settings => $read_db_settings,
}
::base::expose_puppet_certs { '/etc/puppetdb':
@@ -107,18 +107,18 @@
'ssl-cert' => '/etc/puppetdb/ssl/cert.pem',
'ssl-ca-cert' => '/etc/ssl/certs/Puppet_Internal_CA.pem',
},
- require => Base::Expose_puppet_certs['/etc/puppetdb']
+ require => Base::Expose_puppet_certs['/etc/puppetdb'],
}
puppetmaster::puppetdb::config { 'global':
settings => {
'vardir' => '/var/lib/puppetdb',
- 'logging-config' => '/etc/puppetdb/logback.xml'
- }
+ 'logging-config' => '/etc/puppetdb/logback.xml',
+ },
}
puppetmaster::puppetdb::config { 'repl':
- settings => {'enabled' => false}
+ settings => {'enabled' => false},
}
## Enable the service itself
diff --git a/modules/puppetmaster/manifests/puppetdb/database.pp
b/modules/puppetmaster/manifests/puppetdb/database.pp
index 139d5b4..0385e26 100644
--- a/modules/puppetmaster/manifests/puppetdb/database.pp
+++ b/modules/puppetmaster/manifests/puppetdb/database.pp
@@ -8,7 +8,7 @@
if $master == $::fqdn {
# We do this for the require in postgres::db
$require_class = 'postgresql::master'
- class { 'postgresql::master':
+ class { '::postgresql::master':
includes => ['tuning.conf'],
root_dir => '/srv/postgres',
use_ssl => true,
@@ -16,7 +16,7 @@
$on_master = true
} else {
$require_class = 'postgresql::slave'
- class { 'postgresql::slave':
+ class { '::postgresql::slave':
includes => ['tuning.conf'],
master_server => $master,
root_dir => '/srv/postgres',
@@ -30,7 +30,7 @@
if $postgres_users {
$postgres_users_defaults = {
pgversion => 9.4,
- master => $on_master
+ master => $on_master,
}
create_resources(postgresql::user, $postgres_users,
$postgres_users_defaults)
@@ -57,7 +57,7 @@
command => '/usr/bin/psql puppetdb -c "create extension pg_trgm"',
unless => '/usr/bin/psql puppetdb -c \'\dx\' | /bin/grep -q pg_trgm',
user => 'postgres',
- require => Postgresql::Db['puppetdb']
+ require => Postgresql::Db['puppetdb'],
}
}
diff --git a/modules/puppetmaster/manifests/scripts.pp
b/modules/puppetmaster/manifests/scripts.pp
index da93949..e7fa30b 100644
--- a/modules/puppetmaster/manifests/scripts.pp
+++ b/modules/puppetmaster/manifests/scripts.pp
@@ -28,7 +28,7 @@
owner => 'root',
group => 'root',
mode => '0555',
- source => 'puppet:///modules/puppetmaster/puppet-facts-export'
+ source => 'puppet:///modules/puppetmaster/puppet-facts-export',
}
# Clear out older reports
diff --git a/modules/puppetmaster/manifests/ssl.pp
b/modules/puppetmaster/manifests/ssl.pp
index 3c8faef..f93e61d 100644
--- a/modules/puppetmaster/manifests/ssl.pp
+++ b/modules/puppetmaster/manifests/ssl.pp
@@ -16,7 +16,7 @@
# Move the puppetmaster's SSL files to a separate directory from the client
file {
[ '/var/lib/puppet/server',
- $ssldir
+ $ssldir,
]:
ensure => directory,
owner => 'puppet',
@@ -30,7 +30,7 @@
"${ssldir}/private",
"${ssldir}/private_keys",
"${ssldir}/public_keys",
- "${ssldir}/crl"
+ "${ssldir}/crl",
]:
ensure => directory;
}
@@ -39,6 +39,6 @@
require => File["${ssldir}/crl"],
path => '/usr/sbin:/usr/bin:/sbin:/bin',
command => "ln -s ${ssldir}/ca/ca_crl.pem ${ssldir}/crl/$(openssl crl
-in ${ssldir}/ca/ca_crl.pem -hash -noout).0",
- onlyif => "test ! -L ${ssldir}/crl/$(openssl crl -in
${ssldir}/ca/ca_crl.pem -hash -noout).0"
+ onlyif => "test ! -L ${ssldir}/crl/$(openssl crl -in
${ssldir}/ca/ca_crl.pem -hash -noout).0",
}
}
diff --git a/modules/puppetmaster/tests/geoip.pp
b/modules/puppetmaster/tests/geoip.pp
index 42b5e96..84b1e02 100644
--- a/modules/puppetmaster/tests/geoip.pp
+++ b/modules/puppetmaster/tests/geoip.pp
@@ -1,2 +1,2 @@
#
-include puppetmaster::geoip
+include ::puppetmaster::geoip
diff --git a/modules/puppetmaster/tests/gitpuppet.pp
b/modules/puppetmaster/tests/gitpuppet.pp
index f150b1d..2ff787d 100644
--- a/modules/puppetmaster/tests/gitpuppet.pp
+++ b/modules/puppetmaster/tests/gitpuppet.pp
@@ -1,2 +1,2 @@
#
-include puppetmaster::gitpuppet
+include ::puppetmaster::gitpuppet
diff --git a/modules/puppetmaster/tests/labs.pp
b/modules/puppetmaster/tests/labs.pp
index a7e7290..d7dd1f4 100644
--- a/modules/puppetmaster/tests/labs.pp
+++ b/modules/puppetmaster/tests/labs.pp
@@ -1,2 +1,2 @@
#
-include puppetmaster::labs
+include ::puppetmaster::labs
diff --git a/modules/puppetmaster/tests/puppetmaster.pp
b/modules/puppetmaster/tests/puppetmaster.pp
index c820061..1598cfa 100644
--- a/modules/puppetmaster/tests/puppetmaster.pp
+++ b/modules/puppetmaster/tests/puppetmaster.pp
@@ -1,4 +1,4 @@
# lint:ignore:autoloader_layout
class passwords::geoip {}
# lint:endignore
-include puppetmaster
+include ::puppetmaster
diff --git a/modules/puppetmaster/tests/scripts.pp
b/modules/puppetmaster/tests/scripts.pp
index 8cc7728..54f1a2b 100644
--- a/modules/puppetmaster/tests/scripts.pp
+++ b/modules/puppetmaster/tests/scripts.pp
@@ -1,2 +1,2 @@
#
-include puppetmaster::scripts
+include ::puppetmaster::scripts
diff --git a/modules/puppetmaster/tests/ssl.pp
b/modules/puppetmaster/tests/ssl.pp
index 6544cff..9661665 100644
--- a/modules/puppetmaster/tests/ssl.pp
+++ b/modules/puppetmaster/tests/ssl.pp
@@ -1,2 +1,2 @@
#
-include puppetmaster::ssl
+include ::puppetmaster::ssl
--
To view, visit https://gerrit.wikimedia.org/r/332105
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6087086c2c14de27a53da57d5f220abc1f6e689f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Juniorsys <juniorsys_wikime...@outlook.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
