[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: [DO NOT MERGE] Use MariaDB 10.0 to match WMF production

[Code Review]

Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395170 )

Change subject: [DO NOT MERGE] Use MariaDB 10.0 to match WMF production
......................................................................

[DO NOT MERGE] Use MariaDB 10.0 to match WMF production

Change-Id: Iec1907b87b730970a32333e6d80865c5a7b9fe52
---
M puppet/modules/mediawiki/manifests/multiwiki.pp
M puppet/modules/mysql/manifests/init.pp
M puppet/modules/mysql/manifests/large_prefix.pp
M puppet/modules/mysql/manifests/packages.pp
4 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/70/395170/1

diff --git a/puppet/modules/mediawiki/manifests/multiwiki.pp 
b/puppet/modules/mediawiki/manifests/multiwiki.pp
index a29bae8..0a5b206 100644
--- a/puppet/modules/mediawiki/manifests/multiwiki.pp
+++ b/puppet/modules/mediawiki/manifests/multiwiki.pp
@@ -269,8 +269,8 @@
         target  => '/usr/bin/mysql',
         # /usr/bin/mysql is provided by the package
         # mysql-client-core-5.5, but that is only installed as an
-        # implicit dependency of mysql-server required by
+        # implicit dependency of mariadb-server-10.0 required by
         # mysql::packages.
-        require => Package['mysql-server'],
+        require => Package['mariadb-server-10.0'],
     }
 }
diff --git a/puppet/modules/mysql/manifests/init.pp 
b/puppet/modules/mysql/manifests/init.pp
index f503c34..43692b2 100644
--- a/puppet/modules/mysql/manifests/init.pp
+++ b/puppet/modules/mysql/manifests/init.pp
@@ -33,7 +33,7 @@
         ensure     => running,
         enable     => true,
         hasrestart => true,
-        require    => Package['mysql-server'],
+        require    => Package['mariadb-server-10.0'],
     }
 
     exec { 'set_mysql_password':
diff --git a/puppet/modules/mysql/manifests/large_prefix.pp 
b/puppet/modules/mysql/manifests/large_prefix.pp
index 1bce93d..5836a4e 100644
--- a/puppet/modules/mysql/manifests/large_prefix.pp
+++ b/puppet/modules/mysql/manifests/large_prefix.pp
@@ -11,7 +11,7 @@
         group   => 'root',
         mode    => '0444',
         source  => 'puppet:///modules/mysql/innodb_large_prefix.cnf',
-        require => Package['mysql-server'],
+        require => Package['mariadb-server-10.0'],
         notify  => Service['mysql'],
     }
 }
diff --git a/puppet/modules/mysql/manifests/packages.pp 
b/puppet/modules/mysql/manifests/packages.pp
index 73f0a65..c90d476 100644
--- a/puppet/modules/mysql/manifests/packages.pp
+++ b/puppet/modules/mysql/manifests/packages.pp
@@ -4,7 +4,7 @@
 # class so they can be included from multiple locations.
 #
 class mysql::packages {
-    package { 'mysql-server':
+    package { 'mariadb-server-10.0':
         ensure => present,
     }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iec1907b87b730970a32333e6d80865c5a7b9fe52
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza <gti...@wikimedia.org>

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