Juniorsys has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332096 )
Change subject: contint module: Linting changes
......................................................................
contint module: Linting changes
Add trailing commas to abide by the Coding Style guidelines
Use full names for class names, as relative names are not allowed in
future Puppet versions
Bug: T93645
Change-Id: Ibb12d8d8cbe17344ef74ef83a5aa6eee40767c15
---
M modules/contint/manifests/browsers.pp
M modules/contint/manifests/browsertests.pp
M modules/contint/manifests/composer.pp
M modules/contint/manifests/firewall.pp
M modules/contint/manifests/firewall/labs.pp
M modules/contint/manifests/package_builder.pp
M modules/contint/manifests/packages/analytics.pp
M modules/contint/manifests/packages/androidsdk.pp
M modules/contint/manifests/packages/apt.pp
M modules/contint/manifests/packages/labs.pp
M modules/contint/manifests/packages/ops.pp
M modules/contint/manifests/packages/ruby.pp
M modules/contint/manifests/php.pp
M modules/contint/manifests/phpunit.pp
M modules/contint/manifests/proxy_jenkins.pp
M modules/contint/manifests/proxy_zuul.pp
M modules/contint/manifests/slave_scripts.pp
M modules/contint/manifests/website/labs.pp
18 files changed, 27 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/96/332096/1
diff --git a/modules/contint/manifests/browsers.pp
b/modules/contint/manifests/browsers.pp
index 46d6eb0..d4bd15a 100644
--- a/modules/contint/manifests/browsers.pp
+++ b/modules/contint/manifests/browsers.pp
@@ -43,7 +43,7 @@
}
- class { 'xvfb':
+ class { '::xvfb':
display => 94,
resolution => '1280x1024x24',
}
diff --git a/modules/contint/manifests/browsertests.pp
b/modules/contint/manifests/browsertests.pp
index 51eae39..8cdc452 100644
--- a/modules/contint/manifests/browsertests.pp
+++ b/modules/contint/manifests/browsertests.pp
@@ -2,10 +2,10 @@
#
class contint::browsertests {
- include contint::packages::ruby
+ include ::contint::packages::ruby
# Provides phantomjs, firefox and xvfb
- include contint::browsers
+ include ::contint::browsers
# For Selenium jobs recording (T113520)
package { 'libav-tools':
diff --git a/modules/contint/manifests/composer.pp
b/modules/contint/manifests/composer.pp
index 6ee3c8c..3dcedea 100644
--- a/modules/contint/manifests/composer.pp
+++ b/modules/contint/manifests/composer.pp
@@ -5,7 +5,7 @@
#
class contint::composer {
- require contint::deployment_dir
+ require ::contint::deployment_dir
git::clone { 'jenkins CI Composer':
ensure => 'latest',
diff --git a/modules/contint/manifests/firewall.pp
b/modules/contint/manifests/firewall.pp
index 79c6a99..ea950af 100644
--- a/modules/contint/manifests/firewall.pp
+++ b/modules/contint/manifests/firewall.pp
@@ -1,19 +1,19 @@
# vim: set ts=4 sw=4 et:
class contint::firewall {
- include base::firewall
- include network::constants
+ include ::base::firewall
+ include ::network::constants
# Restrict some services to be only reacheable from localhost over both
# IPv4 and IPv6 (to be safe)
# Jenkins on port 8080, reacheable via Apache proxying the requests
ferm::rule { 'jenkins_localhost_only':
- rule => 'proto tcp dport 8080 { saddr (127.0.0.1 ::1) ACCEPT; }'
+ rule => 'proto tcp dport 8080 { saddr (127.0.0.1 ::1) ACCEPT; }',
}
# Zuul status page on port 8001, reacheable via Apache proxying the
requests
ferm::rule { 'zuul_localhost_only':
- rule => 'proto tcp dport 8001 { saddr (127.0.0.1 ::1) ACCEPT; }'
+ rule => 'proto tcp dport 8001 { saddr (127.0.0.1 ::1) ACCEPT; }',
}
# Gearman is used between Zuul and the Jenkin master, both on the same
diff --git a/modules/contint/manifests/firewall/labs.pp
b/modules/contint/manifests/firewall/labs.pp
index 93fa0c1..ca371f7 100644
--- a/modules/contint/manifests/firewall/labs.pp
+++ b/modules/contint/manifests/firewall/labs.pp
@@ -9,11 +9,11 @@
ferm::service { 'contint1001_ssh_to_slaves':
proto => 'tcp',
port => '22',
- srange => '@resolve(contint1001.wikimedia.org)'
+ srange => '@resolve(contint1001.wikimedia.org)',
}
ferm::service { 'contint2001_ssh_to_slaves':
proto => 'tcp',
port => '22',
- srange => '@resolve(contint2001.wikimedia.org)'
+ srange => '@resolve(contint2001.wikimedia.org)',
}
}
diff --git a/modules/contint/manifests/package_builder.pp
b/modules/contint/manifests/package_builder.pp
index 885188a..fc0de36 100644
--- a/modules/contint/manifests/package_builder.pp
+++ b/modules/contint/manifests/package_builder.pp
@@ -32,7 +32,7 @@
],
# Cowdancer is confused by /var/cache/pbuilder being a symlink
# causing it to fail to properly --update cow images. T125999
- basepath => '/mnt/pbuilder'
+ basepath => '/mnt/pbuilder',
}
package { [
diff --git a/modules/contint/manifests/packages/analytics.pp
b/modules/contint/manifests/packages/analytics.pp
index 25f8cd8..c249950 100644
--- a/modules/contint/manifests/packages/analytics.pp
+++ b/modules/contint/manifests/packages/analytics.pp
@@ -5,7 +5,7 @@
class contint::packages::analytics {
# need geoip to build udp-filter
- include geoip
+ include ::geoip
# these are needed to build libanon and udp-filter
package { ['pkg-config', 'libpcap-dev', 'libdb-dev']:
diff --git a/modules/contint/manifests/packages/androidsdk.pp
b/modules/contint/manifests/packages/androidsdk.pp
index cc56481..81bbafc 100644
--- a/modules/contint/manifests/packages/androidsdk.pp
+++ b/modules/contint/manifests/packages/androidsdk.pp
@@ -15,7 +15,7 @@
'xorg',
# Image diffing
'imagemagick',
- 'python-pillow'
+ 'python-pillow',
]: ensure => present,
}
}
diff --git a/modules/contint/manifests/packages/apt.pp
b/modules/contint/manifests/packages/apt.pp
index d632dde..6829b3b 100644
--- a/modules/contint/manifests/packages/apt.pp
+++ b/modules/contint/manifests/packages/apt.pp
@@ -3,7 +3,7 @@
# Apt configuration needed for contint hosts
#
class contint::packages::apt {
- include apt::unattendedupgrades
+ include ::apt::unattendedupgrades
apt::conf { 'unattended-upgrades-wikimedia':
priority => '51',
diff --git a/modules/contint/manifests/packages/labs.pp
b/modules/contint/manifests/packages/labs.pp
index 6042422..e1b7b40 100644
--- a/modules/contint/manifests/packages/labs.pp
+++ b/modules/contint/manifests/packages/labs.pp
@@ -5,9 +5,9 @@
Package['puppet-lint'] -> Class['contint::packages::labs']
- require contint::packages::apt
+ require ::contint::packages::apt
- include contint::packages::base
+ include ::contint::packages::base
include ::mediawiki::packages
include ::mediawiki::packages::multimedia # T76661
@@ -19,8 +19,8 @@
if os_version('ubuntu >= trusty || Debian >= jessie') {
# Fonts needed for browser tests screenshots (T71535)
- include mediawiki::packages::fonts
- include phabricator::arcanist
+ include ::mediawiki::packages::fonts
+ include ::phabricator::arcanist
}
include ::contint::packages::analytics
diff --git a/modules/contint/manifests/packages/ops.pp
b/modules/contint/manifests/packages/ops.pp
index 1730f35..2c2792d 100644
--- a/modules/contint/manifests/packages/ops.pp
+++ b/modules/contint/manifests/packages/ops.pp
@@ -19,5 +19,5 @@
# For Jenkins job operations-dns-lint
# Production DNS migrated to Jessie T98003
- include authdns::lint
+ include ::authdns::lint
}
diff --git a/modules/contint/manifests/packages/ruby.pp
b/modules/contint/manifests/packages/ruby.pp
index 42fd46a..f67c23d 100644
--- a/modules/contint/manifests/packages/ruby.pp
+++ b/modules/contint/manifests/packages/ruby.pp
@@ -18,7 +18,7 @@
# Ruby gems is provided within ruby since Trusty
'rubygems',
]:
- ensure => present
+ ensure => present,
}
# Ubuntu Precise version is too old. Instead use either:
# /srv/deployment/integration/slave-scripts/tools/bundler/bundle
@@ -29,7 +29,7 @@
package { [
'ruby-bundler',
]:
- ensure => absent
+ ensure => absent,
}
}
if os_version('ubuntu >= trusty') {
diff --git a/modules/contint/manifests/php.pp b/modules/contint/manifests/php.pp
index 31cc452..9e5aeb9 100644
--- a/modules/contint/manifests/php.pp
+++ b/modules/contint/manifests/php.pp
@@ -1,6 +1,6 @@
class contint::php {
- require contint::slave_scripts
+ require ::contint::slave_scripts
alternatives::install { 'php':
link => '/usr/bin/php',
diff --git a/modules/contint/manifests/phpunit.pp
b/modules/contint/manifests/phpunit.pp
index 42b86e3..a0eadb5 100644
--- a/modules/contint/manifests/phpunit.pp
+++ b/modules/contint/manifests/phpunit.pp
@@ -6,7 +6,7 @@
# still depends on a local copy.
class contint::phpunit {
- require contint::deployment_dir
+ require ::contint::deployment_dir
git::clone { 'jenkins CI phpunit':
ensure => 'latest',
diff --git a/modules/contint/manifests/proxy_jenkins.pp
b/modules/contint/manifests/proxy_jenkins.pp
index 734ddcd..5ea6807 100644
--- a/modules/contint/manifests/proxy_jenkins.pp
+++ b/modules/contint/manifests/proxy_jenkins.pp
@@ -1,7 +1,7 @@
# A http proxy in front of Jenkins
class contint::proxy_jenkins {
- include proxy_common
+ include ::proxy_common
# run jenkins behind Apache and have pretty URLs / proxy port 80
# https://wiki.jenkins-ci.org/display/JENKINS/Running+Jenkins+behind+Apache
diff --git a/modules/contint/manifests/proxy_zuul.pp
b/modules/contint/manifests/proxy_zuul.pp
index 06df787..c299e56 100644
--- a/modules/contint/manifests/proxy_zuul.pp
+++ b/modules/contint/manifests/proxy_zuul.pp
@@ -1,7 +1,7 @@
# A http proxy in front of Zuul status page
class contint::proxy_zuul {
- include proxy_common
+ include ::proxy_common
file {
'/etc/apache2/conf.d/zuul_proxy':
diff --git a/modules/contint/manifests/slave_scripts.pp
b/modules/contint/manifests/slave_scripts.pp
index 9156203..fe9608b 100644
--- a/modules/contint/manifests/slave_scripts.pp
+++ b/modules/contint/manifests/slave_scripts.pp
@@ -8,7 +8,7 @@
fail('contint::slave_scripts must not be used in production. Slaves
are already Trebuchet deployment targets.')
}
- require contint::deployment_dir
+ require ::contint::deployment_dir
git::clone { 'jenkins CI slave scripts':
ensure => 'latest',
diff --git a/modules/contint/manifests/website/labs.pp
b/modules/contint/manifests/website/labs.pp
index 7695851..f2cf3e2 100644
--- a/modules/contint/manifests/website/labs.pp
+++ b/modules/contint/manifests/website/labs.pp
@@ -1,7 +1,7 @@
class contint::website::labs {
# The contint dev instance also has Gerrit
- include contint::proxy_gerrit
+ include ::contint::proxy_gerrit
apache::site { 'integrationlabs':
content => template('contint/apache/integration.wmflabs.org.erb'),
--
To view, visit https://gerrit.wikimedia.org/r/332096
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb12d8d8cbe17344ef74ef83a5aa6eee40767c15
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
