Dzahn has submitted this change and it was merged.
Change subject: base: minimal lint fixes
......................................................................
base: minimal lint fixes
minimal fixes of quoting and aligned arrows
Change-Id: I3f7ed7a722007c021c47e61654107dd4f2b93231
---
M modules/base/manifests/certificates.pp
M modules/base/manifests/firewall.pp
M modules/base/manifests/grub.pp
M modules/base/manifests/puppet.pp
M modules/base/manifests/resolving.pp
5 files changed, 12 insertions(+), 12 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/base/manifests/certificates.pp
b/modules/base/manifests/certificates.pp
index 83baa07..a255338 100644
--- a/modules/base/manifests/certificates.pp
+++ b/modules/base/manifests/certificates.pp
@@ -2,7 +2,7 @@
include ::sslcert
sslcert::ca { 'wmf_ca_2014_2017':
- source => "puppet:///modules/base/ca/wmf_ca_2014_2017.crt",
+ source => 'puppet:///modules/base/ca/wmf_ca_2014_2017.crt',
}
sslcert::ca { 'RapidSSL_CA':
ensure => 'absent',
diff --git a/modules/base/manifests/firewall.pp
b/modules/base/manifests/firewall.pp
index 937aa71..680b3ba 100644
--- a/modules/base/manifests/firewall.pp
+++ b/modules/base/manifests/firewall.pp
@@ -26,8 +26,8 @@
# The sysctl value net.netfilter.nf_conntrack_buckets is read-only. It is
configured
# via a modprobe parameter, bump it manually for running systems
- exec { "bump nf_conntrack hash table size":
- command => "/bin/echo 32768 >
/sys/module/nf_conntrack/parameters/hashsize",
+ exec { 'bump nf_conntrack hash table size':
+ command => '/bin/echo 32768 >
/sys/module/nf_conntrack/parameters/hashsize',
onlyif => "/bin/grep --invert-match --quiet '^32768$'
/sys/module/nf_conntrack/parameters/hashsize",
}
diff --git a/modules/base/manifests/grub.pp b/modules/base/manifests/grub.pp
index 4a9a3c3..b8c9d52 100644
--- a/modules/base/manifests/grub.pp
+++ b/modules/base/manifests/grub.pp
@@ -41,7 +41,7 @@
# The CFQ I/O scheduler is rather # suboptimal for some of our I/O
# workloads. Override with deadline. (the installer does this too)
exec { 'grub2 iosched deadline':
- path => "/bin:/usr/bin",
+ path => '/bin:/usr/bin',
command => "sed -i '/^GRUB_CMDLINE_LINUX=/s/\\\"\$/
elevator=deadline\\\"/' /etc/default/grub",
unless => "grep -q '^GRUB_CMDLINE_LINUX=.*elevator=deadline'
/etc/default/grub",
onlyif => 'test -f /etc/default/grub',
diff --git a/modules/base/manifests/puppet.pp b/modules/base/manifests/puppet.pp
index bc4899a..a6b1c5b 100644
--- a/modules/base/manifests/puppet.pp
+++ b/modules/base/manifests/puppet.pp
@@ -65,10 +65,10 @@
}
file { '/usr/local/sbin/puppet-run':
- mode => '0555',
- owner => 'root',
- group => 'root',
- source => 'puppet:///modules/base/puppet/puppet-run',
+ mode => '0555',
+ owner => 'root',
+ group => 'root',
+ source => 'puppet:///modules/base/puppet/puppet-run',
}
file { '/etc/cron.d/puppet':
diff --git a/modules/base/manifests/resolving.pp
b/modules/base/manifests/resolving.pp
index 01ab3eb..87286b2 100644
--- a/modules/base/manifests/resolving.pp
+++ b/modules/base/manifests/resolving.pp
@@ -8,10 +8,10 @@
if $::realm == 'labs' {
# Thanks to dhcp, resolvconf is constantly messing with our
resolv.conf. Disable it.
file { '/sbin/resolvconf':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/base/resolv/resolvconf.dummy',
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => 'puppet:///modules/base/resolv/resolvconf.dummy',
}
file { '/etc/dhcp/dhclient-enter-hooks.d':
--
To view, visit https://gerrit.wikimedia.org/r/249666
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3f7ed7a722007c021c47e61654107dd4f2b93231
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
