Dzahn has submitted this change and it was merged.
Change subject: mariadb: 32 lint fixes
......................................................................
mariadb: 32 lint fixes
puppet-lint mariadb.pp | wc -l
before: 72 after: 40
Change-Id: If7b7ea27ef3ce1b5d0a4260cb64289de4b0400c6
---
M manifests/role/mariadb.pp
1 file changed, 32 insertions(+), 32 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index 2d423c4..93f9a4e 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -35,7 +35,7 @@
if $shard {
$nodepool_pass = $passwords::nodepool::nodepooldb_pass
- file { "/etc/mysql/production-grants-shard.sql":
+ file { '/etc/mysql/production-grants-shard.sql':
ensure => present,
owner => 'root',
group => 'root',
@@ -52,20 +52,20 @@
# can grant additional access to other hosts
ferm::service{ 'mariadb_internal':
- proto => 'tcp',
- port => 3306,
+ proto => 'tcp',
+ port => '3306',
notrack => true,
- srange => '$INTERNAL',
+ srange => '$INTERNAL',
}
# tendril monitoring
ferm::rule { 'mariabdb_monitoring':
- rule => "saddr @resolve((neon.wikimedia.org iron.wikimedia.org)) proto
tcp dport (3306) ACCEPT;",
+ rule => 'saddr @resolve((neon.wikimedia.org iron.wikimedia.org)) proto
tcp dport (3306) ACCEPT;',
}
# for DBA purposes
ferm::rule { 'mariabdb_dba':
- rule => "saddr @resolve((neon.wikimedia.org iron.wikimedia.org
db1011.eqiad.wmnet)) proto tcp dport (3307) ACCEPT;",
+ rule => 'saddr @resolve((neon.wikimedia.org iron.wikimedia.org
db1011.eqiad.wmnet)) proto tcp dport (3307) ACCEPT;',
}
}
@@ -200,7 +200,7 @@
) {
system::role { 'role::mariadb::misc':
- description => "Eventlogging Database",
+ description => 'Eventlogging Database',
}
include standard
@@ -449,7 +449,7 @@
$p_s = 'off',
) {
- system::role { "role::mariadb::core":
+ system::role { 'role::mariadb::core':
description => "Core DB Server ${shard}",
}
@@ -480,8 +480,8 @@
class role::mariadb::sanitarium {
- system::role { "role::mariadb::sanitarium":
- description => "Sanitarium DB Server",
+ system::role { 'role::mariadb::sanitarium':
+ description => 'Sanitarium DB Server',
}
include standard
@@ -493,7 +493,7 @@
}
class { 'mariadb::config':
- prompt => "SANITARIUM",
+ prompt => 'SANITARIUM',
config => 'mariadb/sanitarium.my.cnf.erb',
password => $passwords::misc::scripts::mysql_root_pass,
}
@@ -519,20 +519,20 @@
# One instance per shard using mysqld_multi.
# This allows us to send separate replication channels downstream.
$folders = [
- "/srv/sqldata.s1",
- "/srv/sqldata.s2",
- "/srv/sqldata.s3",
- "/srv/sqldata.s4",
- "/srv/sqldata.s5",
- "/srv/sqldata.s6",
- "/srv/sqldata.s7",
- "/srv/tmp.s1",
- "/srv/tmp.s2",
- "/srv/tmp.s3",
- "/srv/tmp.s4",
- "/srv/tmp.s5",
- "/srv/tmp.s6",
- "/srv/tmp.s7",
+ '/srv/sqldata.s1',
+ '/srv/sqldata.s2',
+ '/srv/sqldata.s3',
+ '/srv/sqldata.s4',
+ '/srv/sqldata.s5',
+ '/srv/sqldata.s6',
+ '/srv/sqldata.s7',
+ '/srv/tmp.s1',
+ '/srv/tmp.s2',
+ '/srv/tmp.s3',
+ '/srv/tmp.s4',
+ '/srv/tmp.s5',
+ '/srv/tmp.s6',
+ '/srv/tmp.s7',
]
file { $folders:
@@ -585,7 +585,7 @@
}
class { 'mariadb::config':
- prompt => "LABS",
+ prompt => 'LABS',
config => 'mariadb/labs.my.cnf.erb',
password => $passwords::misc::scripts::mysql_root_pass,
datadir => '/srv/sqldata',
@@ -609,7 +609,7 @@
# Required for TokuDB to start
# See
https://mariadb.com/kb/en/mariadb/enabling-tokudb/#check-for-transparent-hugepage-support-on-linux
sysfs::parameters { 'disable-transparent-hugepages':
- values => {
+ values => {
'kernel/mm/transparent_hugepage/enabled' => 'never',
'kernel/mm/transparent_hugepage/defrag' => 'never',
}
@@ -620,7 +620,7 @@
class role::mariadb::wikitech {
system::role { 'role::mariadb::wikitech':
- description => "Wikitech Database",
+ description => 'Wikitech Database',
}
include standard
@@ -634,7 +634,7 @@
}
class { 'mariadb::config':
- prompt => "WIKITECH",
+ prompt => 'WIKITECH',
config => 'mariadb/wikitech.my.cnf.erb',
password => $passwords::misc::scripts::mysql_root_pass,
datadir => '/srv/sqldata',
@@ -643,7 +643,7 @@
# mysql monitoring access from tendril (db1011)
ferm::rule { 'mysql_tendril':
- rule => "saddr 10.64.0.15 proto tcp dport (3306) ACCEPT;",
+ rule => 'saddr 10.64.0.15 proto tcp dport (3306) ACCEPT;',
}
# mysql from deployment master servers and terbium (T98682, T109736)
@@ -672,7 +672,7 @@
}
class { 'haproxy':
- template => "mariadb/haproxy.cfg.erb",
+ template => 'mariadb/haproxy.cfg.erb',
}
}
@@ -699,7 +699,7 @@
nrpe::monitor_service { 'haproxy_failover':
description => 'haproxy failover',
- nrpe_command => "/usr/lib/nagios/plugins/check_haproxy
--check=failover",
+ nrpe_command => '/usr/lib/nagios/plugins/check_haproxy
--check=failover',
}
}
--
To view, visit https://gerrit.wikimedia.org/r/249038
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If7b7ea27ef3ce1b5d0a4260cb64289de4b0400c6
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Jcrespo <[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
