Jcrespo has submitted this change and it was merged.
Change subject: Revert "mariadb: add mariadb::service for all 10.0
mariadb::packages_wmf"
......................................................................
Revert "mariadb: add mariadb::service for all 10.0 mariadb::packages_wmf"
This reverts commit c2799d8209a72ac34716284dd831efda4d7d84c3.
Change-Id: Ic02ed836a6148f9a25eb5e26b1a335404106dc85
---
M manifests/role/mariadb.pp
M modules/mariadb
2 files changed, 2 insertions(+), 1 deletion(-)
Approvals:
Jcrespo: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index 5aece41..ad181c2 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -270,6 +270,7 @@
class { 'mariadb::packages_wmf':
mariadb10 => $mariadb10,
}
+ include mariadb::service
$mysql_role = $master ? {
true => 'master',
diff --git a/modules/mariadb b/modules/mariadb
index c11df28..4ec6ebd 160000
--- a/modules/mariadb
+++ b/modules/mariadb
@@ -1 +1 @@
-Subproject commit c11df28be7145869c549fe091eb74ec42097b989
+Subproject commit 4ec6ebda64d1737c13d30ef3ddc0509d0ca1329a
--
To view, visit https://gerrit.wikimedia.org/r/316562
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic02ed836a6148f9a25eb5e26b1a335404106dc85
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <jcre...@wikimedia.org>
Gerrit-Reviewer: Jcrespo <jcre...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
