Pyoungmeister has submitted this change and it was merged.
Change subject: invoking mysql::config correctly
......................................................................
invoking mysql::config correctly
Change-Id: I47f9055d7e67ae14932118f4348fad58dbe1015b
---
M manifests/role/db.pp
1 file changed, 6 insertions(+), 12 deletions(-)
Approvals:
Pyoungmeister: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/db.pp b/manifests/role/db.pp
index 9c1645e..510f8f4 100644
--- a/manifests/role/db.pp
+++ b/manifests/role/db.pp
@@ -35,21 +35,15 @@
include role::db::sanitarium::base
- class { mysql::config :
- port => $port,
- config_file => "/etc/my.cnf.$port",
- socket => "/tmp/mysql.$port.sock",
- pidfile => "/a/sqldata.$port/mysql.pid",
- datadir => "/a/sqldata.$port/",
- multi_instance => true,
- }
-
class { mysql::server :
package_name => 'mariadb-server-5.5',
config_hash => {
- 'client' => {
-
- }
+ port => $port,
+ config_file => "/etc/my.cnf.$port",
+ socket => "/tmp/mysql.$port.sock",
+ pidfile => "/a/sqldata.$port/mysql.pid",
+ datadir => "/a/sqldata.$port/",
+ multi_instance => true,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/55428
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I47f9055d7e67ae14932118f4348fad58dbe1015b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Pyoungmeister <[email protected]>
Gerrit-Reviewer: Pyoungmeister <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
