Jcrespo has submitted this change and it was merged.
Change subject: mariadb: add mariadb::service for all 10.0 mariadb::packages_wmf
......................................................................
mariadb: add mariadb::service for all 10.0 mariadb::packages_wmf
Add a custom init.d service for all servers using the
mariadb::packages_wmf that install mariadb10. The new file will
either overwrite the package one or include it for the first time
(on new packages).
Change-Id: Ib0fbb64d18e28e52b91c6772381a078c240493d9
---
M manifests/role/mariadb.pp
M modules/mariadb
2 files changed, 1 insertion(+), 2 deletions(-)
Approvals:
Jcrespo: Looks good to me, approved
Marostegui: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index ad181c2..5aece41 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -270,7 +270,6 @@
class { 'mariadb::packages_wmf':
mariadb10 => $mariadb10,
}
- include mariadb::service
$mysql_role = $master ? {
true => 'master',
diff --git a/modules/mariadb b/modules/mariadb
index 4ec6ebd..c11df28 160000
--- a/modules/mariadb
+++ b/modules/mariadb
@@ -1 +1 @@
-Subproject commit 4ec6ebda64d1737c13d30ef3ddc0509d0ca1329a
+Subproject commit c11df28be7145869c549fe091eb74ec42097b989
--
To view, visit https://gerrit.wikimedia.org/r/316332
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0fbb64d18e28e52b91c6772381a078c240493d9
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <jcre...@wikimedia.org>
Gerrit-Reviewer: Jcrespo <jcre...@wikimedia.org>
Gerrit-Reviewer: Marostegui <maroste...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
