Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334285 )
Change subject: gerrit/git/graphite: Linting fixes
......................................................................
gerrit/git/graphite: Linting fixes
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: Ide7a42c5815dfbd0efa255b0a5c63dc9cf3baaaf
---
M modules/gerrit/manifests/init.pp
M modules/gerrit/manifests/jetty.pp
M modules/git/manifests/install.pp
M modules/git/manifests/userconfig.pp
M modules/graphite/manifests/monitoring/graphite.pp
5 files changed, 13 insertions(+), 13 deletions(-)
Approvals:
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp
index b897735..541fec2 100644
--- a/modules/gerrit/manifests/init.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -11,16 +11,16 @@
default => true
}
- class { 'gerrit::jetty':
+ class { '::gerrit::jetty':
slave => $slave,
}
if !$slave {
- class { 'gerrit::proxy':
+ class { '::gerrit::proxy':
require => Class['gerrit::jetty'],
}
- class { 'gerrit::crons':
+ class { '::gerrit::crons':
require => Class['gerrit::jetty'],
}
}
diff --git a/modules/gerrit/manifests/jetty.pp
b/modules/gerrit/manifests/jetty.pp
index 67eed6c..0e7c92f 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -13,16 +13,16 @@
$log_port = '4560'
) {
- include nrpe
+ include ::nrpe
# Private config
- include passwords::gerrit
+ include ::passwords::gerrit
$email_key = $passwords::gerrit::gerrit_email_key
$db_pass = $passwords::gerrit::gerrit_db_pass
$phab_cert = $passwords::gerrit::gerrit_phab_cert
# Setup LDAP
- include ldap::role::config::labs
+ include ::ldap::role::config::labs
$ldapconfig = $ldap::role::config::labs::ldapconfig
$ldap_hosts = $ldapconfig['servernames']
diff --git a/modules/git/manifests/install.pp b/modules/git/manifests/install.pp
index ff865d8..8e4c1bc 100644
--- a/modules/git/manifests/install.pp
+++ b/modules/git/manifests/install.pp
@@ -72,7 +72,7 @@
source => $post_checkout,
owner => $owner,
group => $group,
- require => Git::Clone[$title]
+ require => Git::Clone[$title],
}
}
@@ -98,7 +98,7 @@
cwd => $directory,
user => $owner,
path => '/usr/bin/',
- refreshonly => true
+ refreshonly => true,
}
}
}
diff --git a/modules/git/manifests/userconfig.pp
b/modules/git/manifests/userconfig.pp
index 4d2f36d..331ad41 100644
--- a/modules/git/manifests/userconfig.pp
+++ b/modules/git/manifests/userconfig.pp
@@ -27,7 +27,7 @@
owner => 'root',
group => 'root',
mode => '0444',
- content => template( 'git/gitconfig.erb' )
+ content => template( 'git/gitconfig.erb' ),
}
}
diff --git a/modules/graphite/manifests/monitoring/graphite.pp
b/modules/graphite/manifests/monitoring/graphite.pp
index 9775ef8..1bff44f 100644
--- a/modules/graphite/manifests/monitoring/graphite.pp
+++ b/modules/graphite/manifests/monitoring/graphite.pp
@@ -14,7 +14,7 @@
from => '10minutes',
warning => 200,
critical => 1000,
- nagios_critical => false
+ nagios_critical => false,
}
# is carbon-cache able to write to disk (e.g. permissions)
@@ -24,7 +24,7 @@
from => '10minutes',
warning => 1,
critical => 8,
- nagios_critical => false
+ nagios_critical => false,
}
# are carbon-cache queues overflowing their capacity?
@@ -34,7 +34,7 @@
from => '10minutes',
warning => 1,
critical => 8,
- nagios_critical => false
+ nagios_critical => false,
}
# are we creating too many metrics?
@@ -44,6 +44,6 @@
from => '1hour',
warning => 500,
critical => 1000,
- nagios_critical => false
+ nagios_critical => false,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/334285
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ide7a42c5815dfbd0efa255b0a5c63dc9cf3baaaf
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Juniorsys <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
