[MediaWiki-commits] [Gerrit] operations/puppet[production]: contint module: Linting changes
Dzahn has submitted this change and it was merged. (
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(-)
Approvals:
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
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
[MediaWiki-commits] [Gerrit] operations/puppet[production]: contint module: Linting changes
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 =>
