Jcrespo has submitted this change and it was merged.

Change subject: Add mariadb::service selectively, only on single-instance dbs
......................................................................


Add mariadb::service selectively, only on single-instance dbs

Also assume mariadb10 is the default, no need to explicitly
indicate we do not want 5.5.

Change-Id: I7fe9a648881613ceb491dec2fe07e4053db4228e
---
M manifests/role/mariadb.pp
M modules/mariadb
2 files changed, 21 insertions(+), 31 deletions(-)

Approvals:
  Jcrespo: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index ad181c2..117d2fb 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -226,9 +226,8 @@
         mysql_role  => $mysql_role,
     }
 
-    class { 'mariadb::packages_wmf':
-        mariadb10 => true,
-    }
+    include mariadb::packages_wmf
+    include mariadb::service
 
     class { 'mariadb::config':
         config    => 'mariadb/misc.my.cnf.erb',
@@ -267,9 +266,7 @@
     }
 
     include standard
-    class { 'mariadb::packages_wmf':
-        mariadb10 => $mariadb10,
-    }
+    include mariadb::packages_wmf
     include mariadb::service
 
     $mysql_role = $master ? {
@@ -377,9 +374,8 @@
         mysql_role  => $mysql_role,
     }
 
-    class { 'mariadb::packages_wmf':
-        mariadb10 => true,
-    }
+    include mariadb::packages_wmf
+    include mariadb::service
 
     $read_only = $master ? {
         true  => 0,
@@ -419,6 +415,7 @@
 
     include standard
     include mariadb::packages_wmf
+    include mariadb::service
     include passwords::misc::scripts
 
     # This is essentially the same volume created by role::labs::lvm::srv but
@@ -452,9 +449,8 @@
         description => 'tendril database server',
     }
 
-    class { 'mariadb::packages_wmf':
-        mariadb10 => true,
-    }
+    include mariadb::packages_wmf
+    include mariadb::service
 
     include standard
     include role::mariadb::monitor::dba
@@ -484,9 +480,8 @@
         description => 'Delayed Slave',
     }
 
-    class { 'mariadb::packages_wmf':
-        mariadb10 => true,
-    }
+    include mariadb::packages_wmf
+    include mariadb::service
 
     include standard
     include passwords::misc::scripts
@@ -641,9 +636,8 @@
     }
 
 
-    class { 'mariadb::packages_wmf':
-        mariadb10 => true,
-    }
+    include mariadb::packages_wmf
+    include mariadb::service
 
     # Semi-sync replication
     # off: for non-primary datacenter and read-only shard(s)
@@ -708,9 +702,8 @@
         mysql_role  => 'slave',
     }
 
-    class { 'mariadb::packages_wmf':
-        mariadb10 => true,
-    }
+    include mariadb::packages_wmf
+    # do not add mariadb::service, multi-instance has its own way
 
     class { 'mariadb::config':
         config   => 'mariadb/sanitarium.my.cnf.erb',
@@ -802,9 +795,8 @@
         mysql_role  => 'slave',
     }
 
-    class { 'mariadb::packages_wmf':
-        mariadb10 => true,
-    }
+    include mariadb::packages_wmf
+    include mariadb::service
 
     class { 'mariadb::config':
         config  => 'mariadb/labs.my.cnf.erb',
@@ -852,9 +844,8 @@
         mysql_role  => 'standalone',
     }
 
-    class { 'mariadb::packages_wmf':
-        mariadb10 => true,
-    }
+    include mariadb::packages_wmf
+    include mariadb::service
 
     class { 'mariadb::config':
         config  => 'mariadb/wikitech.my.cnf.erb',
@@ -966,9 +957,8 @@
         description => "Parser Cache Database ${shard}",
     }
 
-    class { 'mariadb::packages_wmf':
-        mariadb10 => true,
-    }
+    include mariadb::packages_wmf
+    include mariadb::service
 
     include role::mariadb::grants::core
     class { 'role::mariadb::grants::production':
diff --git a/modules/mariadb b/modules/mariadb
index 43f9a90..a639204 160000
--- a/modules/mariadb
+++ b/modules/mariadb
@@ -1 +1 @@
-Subproject commit 43f9a909d8910e6041d29886717cb6ba8c21c58e
+Subproject commit a6392048b98875ae19a51a1551877569bf1f9e3b

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7fe9a648881613ceb491dec2fe07e4053db4228e
Gerrit-PatchSet: 3
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

Reply via email to