[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add mariadb::services to labs::db

[Jcrespo (Code Review)]

Jcrespo has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/316590

Change subject: Add mariadb::services to labs::db
......................................................................

Add mariadb::services to labs::db

Change-Id: Ib02371d6d6950ae4e80622c1cfab6f5cf2713a01
---
M modules/role/manifests/labs/db/master.pp
M modules/role/manifests/labs/db/replica.pp
M modules/role/manifests/labs/db/slave.pp
3 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/90/316590/1

diff --git a/modules/role/manifests/labs/db/master.pp 
b/modules/role/manifests/labs/db/master.pp
index 177b5b6..58a62d0 100644
--- a/modules/role/manifests/labs/db/master.pp
+++ b/modules/role/manifests/labs/db/master.pp
@@ -8,6 +8,8 @@
     class { 'mariadb::packages_wmf':
         mariadb10 => false
     }
+    # only when migrated to mariadb10:
+    # include mariadb::service
     include role::mariadb::monitor
     include passwords::misc::scripts
 
diff --git a/modules/role/manifests/labs/db/replica.pp 
b/modules/role/manifests/labs/db/replica.pp
index b731be9..d84a435 100644
--- a/modules/role/manifests/labs/db/replica.pp
+++ b/modules/role/manifests/labs/db/replica.pp
@@ -5,9 +5,8 @@
     }
 
     include standard
-    class { 'mariadb::packages_wmf':
-        mariadb10 => true
-    }
+    include mariadb::packages_wmf
+    include mariadb::service
     include role::mariadb::monitor
     include base::firewall
     include role::mariadb::ferm
diff --git a/modules/role/manifests/labs/db/slave.pp 
b/modules/role/manifests/labs/db/slave.pp
index 38aa671..6a545c8 100644
--- a/modules/role/manifests/labs/db/slave.pp
+++ b/modules/role/manifests/labs/db/slave.pp
@@ -5,9 +5,8 @@
     }
 
     include standard
-    class { 'mariadb::packages_wmf':
-        mariadb10 => true
-    }
+    include mariadb::packages_wmf
+    include mariadb::service
     include role::mariadb::monitor
     include role::mariadb::ferm
     include passwords::misc::scripts

-- 
To view, visit https://gerrit.wikimedia.org/r/316590
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib02371d6d6950ae4e80622c1cfab6f5cf2713a01
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <jcre...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits