Jcrespo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/321888
Change subject: mariadb: Remove /root/.my.cnf from all servers
......................................................................
mariadb: Remove /root/.my.cnf from all servers
The root-owned file is no longer needed (there is not root
password), and prompt can be handled on the main config file.
Bug: T150446
Change-Id: I4ce1eebbcd9becd3e6e91105a967113a09bc789e
---
M modules/role/manifests/mariadb.pp
1 file changed, 5 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/88/321888/1
diff --git a/modules/role/manifests/mariadb.pp
b/modules/role/manifests/mariadb.pp
index 840342c..0bce058 100644
--- a/modules/role/manifests/mariadb.pp
+++ b/modules/role/manifests/mariadb.pp
@@ -16,7 +16,6 @@
# wikitech hosts, etc.
class role::mariadb::grants::production(
$shard = false,
- $prompt = '',
$password = 'undefined',
) {
@@ -45,10 +44,7 @@
}
file { '/root/.my.cnf':
- owner => 'root',
- group => 'root',
- mode => '0400',
- content => template('mariadb/root.my.cnf.erb'),
+ ensure => absent,
}
if $shard {
@@ -239,7 +235,6 @@
class { 'role::mariadb::grants::production':
shard => $shard,
- prompt => "MISC ${shard}",
password => $passwords::misc::scripts::mysql_root_pass,
}
@@ -328,7 +323,6 @@
class { 'role::mariadb::grants::production':
shard => $shard,
- prompt => "MISC ${shard}",
password => $passwords::misc::scripts::mysql_root_pass,
}
@@ -395,7 +389,6 @@
class { 'role::mariadb::grants::production':
shard => $shard,
- prompt => "EVENTLOGGING ${shard}",
password => $passwords::misc::scripts::mysql_root_pass,
}
@@ -430,16 +423,11 @@
}
class { 'mariadb::config':
- config => 'mariadb/beta.my.cnf.erb',
+ config => 'mariadb/beta.my.cnf.erb',
}
- $password = $passwords::misc::scripts::mysql_beta_root_pass
- $prompt = 'BETA'
file { '/root/.my.cnf':
- owner => 'root',
- group => 'root',
- mode => '0400',
- content => template('mariadb/root.my.cnf.erb'),
+ ensure => absent,
}
}
@@ -489,7 +477,6 @@
class { 'role::mariadb::grants::production':
password => $passwords::misc::scripts::mysql_root_pass,
- prompt => 'DBSTORE',
}
include role::mariadb::monitor::dba
@@ -667,7 +654,6 @@
include role::mariadb::grants::core
class { 'role::mariadb::grants::production':
shard => 'core',
- prompt => "PRODUCTION ${shard}",
password => $passwords::misc::scripts::mysql_root_pass,
}
@@ -1000,7 +986,6 @@
include role::mariadb::grants::core
class { 'role::mariadb::grants::production':
shard => 'parsercache',
- prompt => 'PARSERCACHE',
password => $passwords::misc::scripts::mysql_root_pass,
}
@@ -1083,16 +1068,11 @@
include passwords::misc::scripts
class { 'mariadb::config':
- ssl => 'puppet-cert',
+ ssl => 'puppet-cert',
}
- $password = $passwords::misc::scripts::mysql_root_pass
- $prompt = 'MARIADB'
file { '/root/.my.cnf':
- owner => 'root',
- group => 'root',
- mode => '0400',
- content => template('mariadb/root.my.cnf.erb'),
+ ensure => absent,
}
package {
--
To view, visit https://gerrit.wikimedia.org/r/321888
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ce1eebbcd9becd3e6e91105a967113a09bc789e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
