[MediaWiki-commits] [Gerrit] operations/puppet[production]: base module linting changes

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331960 )

Change subject: base module linting changes
..


base module linting changes

Add missing trailing commas

Use class full names for includes, as relative names are not allowed in
future Puppet versions

Quote values in selectors

Change-Id: I8bf871e38b0fbefc6948be626f173f38f30e1ca3
---
M modules/base/manifests/certificates.pp
M modules/base/manifests/environment.pp
M modules/base/manifests/firewall.pp
M modules/base/manifests/init.pp
M modules/base/manifests/labs.pp
M modules/base/manifests/monitoring/host.pp
M modules/base/manifests/phaste.pp
M modules/base/manifests/puppet.pp
M modules/base/manifests/service_unit.pp
M modules/base/manifests/standard_packages.pp
10 files changed, 52 insertions(+), 52 deletions(-)

Approvals:
  Alexandros Kosiaris: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/base/manifests/certificates.pp 
b/modules/base/manifests/certificates.pp
index 74a694b..0601302 100644
--- a/modules/base/manifests/certificates.pp
+++ b/modules/base/manifests/certificates.pp
@@ -23,7 +23,7 @@
 $puppet_ssl_dir = puppet_ssldir()
 
 sslcert::ca { 'Puppet_Internal_CA':
-source => "${puppet_ssl_dir}/certs/ca.pem"
+source => "${puppet_ssl_dir}/certs/ca.pem",
 }
 
 # install all CAs before generating certificates
diff --git a/modules/base/manifests/environment.pp 
b/modules/base/manifests/environment.pp
index 3599a92..4a95fc8 100644
--- a/modules/base/manifests/environment.pp
+++ b/modules/base/manifests/environment.pp
@@ -19,7 +19,7 @@
 /^#alias ll=/ s/^#//
 /^#alias la=/ s/^#//
 ' /root/.bashrc",
-onlyif  => "grep -q '^#alias ll' /root/.bashrc"
+onlyif  => "grep -q '^#alias ll' /root/.bashrc",
 }
 
 file { '/etc/profile.d/mysql-ps1.sh':
@@ -73,7 +73,7 @@
 ### Settings commons to all realms
 
 $wikimedia_cluster = $::realm ? {
-labs=> "labs\n",
+'labs'  => "labs\n",
 default => "${::site}\n",
 }
 
diff --git a/modules/base/manifests/firewall.pp 
b/modules/base/manifests/firewall.pp
index 69b5b5e..130c984 100644
--- a/modules/base/manifests/firewall.pp
+++ b/modules/base/manifests/firewall.pp
@@ -1,8 +1,8 @@
 # Don't include this sub class on all hosts yet
 # NOTE: Policy is DROP by default
 class base::firewall($ensure = 'present') {
-include network::constants
-include ferm
+include ::network::constants
+include ::ferm
 
 $defscontent = $::realm ? {
 'labs'  => template('base/firewall/defs.erb', 
'base/firewall/defs.labs.erb'),
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index f0550f7..232a3e0 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -1,5 +1,5 @@
 class base {
-include apt
+include ::apt
 
 file { '/usr/local/sbin':
 ensure => directory,
@@ -10,43 +10,43 @@
 
 $puppetmaster = hiera('puppetmaster')
 
-class { 'base::puppet':
+class { '::base::puppet':
 server   => $puppetmaster,
 }
 
 # Temporary workaround for T140100. Remove as soon as Labs instances get
 # grub-pc or trusty gets phased out from Labs, whichever comes first.
 if ($::realm == 'production') or (os_version('debian >= jessie')) {
-include grub::defaults
+include ::grub::defaults
 }
 
-include passwords::root
-include base::resolving
+include ::passwords::root
+include ::base::resolving
 include ::rsyslog
-include base::remote_syslog
-include base::sysctl
+include ::base::remote_syslog
+include ::base::sysctl
 include ::motd
-include base::standard_packages
-include base::environment
-include base::phaste
-include base::screenconfig
-include base::certificates
-include ssh::client
-include ssh::server
-include role::salt::minions
+include ::base::standard_packages
+include ::base::environment
+include ::base::phaste
+include ::base::screenconfig
+include ::base::certificates
+include ::ssh::client
+include ::ssh::server
+include ::role::salt::minions
 include ::trebuchet
-include nrpe
-include base::kernel
-include base::debdeploy
+include ::nrpe
+include ::base::kernel
+include ::base::debdeploy
 
 # lint:ignore:quoted_booleans
 if $::is_virtual == 'false' {
-include ipmi::monitor
+include ::ipmi::monitor
 }
 # lint:endignore
 
 if os_version('debian >= jessie') {
-include base::initramfs
+include ::base::initramfs
 }
 
 # include base::monitor::host.
@@ -55,7 +55,7 @@
 
 $group_contact = hiera('contactgroups', 'admins')
 
-class { 'base::monitoring::host':
+class { '::

[MediaWiki-commits] [Gerrit] operations/puppet[production]: base module linting changes

[Juniorsys (Code Review)]

Juniorsys has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331960 )

Change subject: base module linting changes
..

base module linting changes

Add missing trailing commas

Use class full names for includes, as relative names are not allowed in
future Puppet versions

Quote values in selectors

Change-Id: I8bf871e38b0fbefc6948be626f173f38f30e1ca3
---
M modules/base/manifests/certificates.pp
M modules/base/manifests/environment.pp
M modules/base/manifests/firewall.pp
M modules/base/manifests/init.pp
M modules/base/manifests/labs.pp
M modules/base/manifests/monitoring/host.pp
M modules/base/manifests/phaste.pp
M modules/base/manifests/puppet.pp
M modules/base/manifests/service_unit.pp
M modules/base/manifests/standard_packages.pp
10 files changed, 52 insertions(+), 52 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/60/331960/1

diff --git a/modules/base/manifests/certificates.pp 
b/modules/base/manifests/certificates.pp
index 74a694b..0601302 100644
--- a/modules/base/manifests/certificates.pp
+++ b/modules/base/manifests/certificates.pp
@@ -23,7 +23,7 @@
 $puppet_ssl_dir = puppet_ssldir()
 
 sslcert::ca { 'Puppet_Internal_CA':
-source => "${puppet_ssl_dir}/certs/ca.pem"
+source => "${puppet_ssl_dir}/certs/ca.pem",
 }
 
 # install all CAs before generating certificates
diff --git a/modules/base/manifests/environment.pp 
b/modules/base/manifests/environment.pp
index 3599a92..4a95fc8 100644
--- a/modules/base/manifests/environment.pp
+++ b/modules/base/manifests/environment.pp
@@ -19,7 +19,7 @@
 /^#alias ll=/ s/^#//
 /^#alias la=/ s/^#//
 ' /root/.bashrc",
-onlyif  => "grep -q '^#alias ll' /root/.bashrc"
+onlyif  => "grep -q '^#alias ll' /root/.bashrc",
 }
 
 file { '/etc/profile.d/mysql-ps1.sh':
@@ -73,7 +73,7 @@
 ### Settings commons to all realms
 
 $wikimedia_cluster = $::realm ? {
-labs=> "labs\n",
+'labs'  => "labs\n",
 default => "${::site}\n",
 }
 
diff --git a/modules/base/manifests/firewall.pp 
b/modules/base/manifests/firewall.pp
index 69b5b5e..130c984 100644
--- a/modules/base/manifests/firewall.pp
+++ b/modules/base/manifests/firewall.pp
@@ -1,8 +1,8 @@
 # Don't include this sub class on all hosts yet
 # NOTE: Policy is DROP by default
 class base::firewall($ensure = 'present') {
-include network::constants
-include ferm
+include ::network::constants
+include ::ferm
 
 $defscontent = $::realm ? {
 'labs'  => template('base/firewall/defs.erb', 
'base/firewall/defs.labs.erb'),
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index f0550f7..232a3e0 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -1,5 +1,5 @@
 class base {
-include apt
+include ::apt
 
 file { '/usr/local/sbin':
 ensure => directory,
@@ -10,43 +10,43 @@
 
 $puppetmaster = hiera('puppetmaster')
 
-class { 'base::puppet':
+class { '::base::puppet':
 server   => $puppetmaster,
 }
 
 # Temporary workaround for T140100. Remove as soon as Labs instances get
 # grub-pc or trusty gets phased out from Labs, whichever comes first.
 if ($::realm == 'production') or (os_version('debian >= jessie')) {
-include grub::defaults
+include ::grub::defaults
 }
 
-include passwords::root
-include base::resolving
+include ::passwords::root
+include ::base::resolving
 include ::rsyslog
-include base::remote_syslog
-include base::sysctl
+include ::base::remote_syslog
+include ::base::sysctl
 include ::motd
-include base::standard_packages
-include base::environment
-include base::phaste
-include base::screenconfig
-include base::certificates
-include ssh::client
-include ssh::server
-include role::salt::minions
+include ::base::standard_packages
+include ::base::environment
+include ::base::phaste
+include ::base::screenconfig
+include ::base::certificates
+include ::ssh::client
+include ::ssh::server
+include ::role::salt::minions
 include ::trebuchet
-include nrpe
-include base::kernel
-include base::debdeploy
+include ::nrpe
+include ::base::kernel
+include ::base::debdeploy
 
 # lint:ignore:quoted_booleans
 if $::is_virtual == 'false' {
-include ipmi::monitor
+include ::ipmi::monitor
 }
 # lint:endignore
 
 if os_version('debian >= jessie') {
-include base::initramfs
+include ::base::initramfs
 }
 
 # include base::monitor::host.
@@ -55,7 +55,7 @@
 
 $group_contact = hiera('contactgroups', 'admins')
 
-class { 'base::monitoring::host':
+class { '::base::monitoring