[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: mysql: Use mariadb-server package

2017-12-24 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/400118 )

Change subject: mysql: Use mariadb-server package
..


mysql: Use mariadb-server package

Change from the transitional "mysql-server" package to the
"mariadb-server" package. Also explicitly tell Puppet that the mariadb
service is managed via systemd.

Bug: T51652

Change-Id: If6bc65c1648fe6b5f323094cf2b2dcc9dbbac361
---
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, 6 insertions(+), 9 deletions(-)

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



diff --git a/puppet/modules/mediawiki/manifests/multiwiki.pp 
b/puppet/modules/mediawiki/manifests/multiwiki.pp
index a29bae8..6baf1d8 100644
--- a/puppet/modules/mediawiki/manifests/multiwiki.pp
+++ b/puppet/modules/mediawiki/manifests/multiwiki.pp
@@ -267,10 +267,6 @@
 file { '/usr/local/bin/sql':
 ensure  => link,
 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
-# mysql::packages.
-require => Package['mysql-server'],
+require => Package['mariadb-server'],
 }
 }
diff --git a/puppet/modules/mysql/manifests/init.pp 
b/puppet/modules/mysql/manifests/init.pp
index 113ce1f..f7b85da 100644
--- a/puppet/modules/mysql/manifests/init.pp
+++ b/puppet/modules/mysql/manifests/init.pp
@@ -24,11 +24,12 @@
 ) {
 include ::mysql::packages
 
-service { 'mysql':
+service { 'mariadb':
 ensure => running,
 enable => true,
+provider   => 'systemd',
 hasrestart => true,
-require=> Package['mysql-server'],
+require=> Package['mariadb-server'],
 }
 
 # Setup password free auth for VM's vagrant user
diff --git a/puppet/modules/mysql/manifests/large_prefix.pp 
b/puppet/modules/mysql/manifests/large_prefix.pp
index 1bce93d..568d47b 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'],
 notify  => Service['mysql'],
 }
 }
diff --git a/puppet/modules/mysql/manifests/packages.pp 
b/puppet/modules/mysql/manifests/packages.pp
index 73f0a65..46944ae 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':
 ensure => present,
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If6bc65c1648fe6b5f323094cf2b2dcc9dbbac361
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: mysql: Use mariadb-server package

2017-12-24 Thread BryanDavis (Code Review) 
BryanDavis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/400118 )

Change subject: mysql: Use mariadb-server package
..

mysql: Use mariadb-server package

Change from the transitional "mysql-server" package to the
"mariadb-server" package. Also explicitly tell Puppet that the mariadb
service is managed via systemd.

Bug: T51652

Change-Id: If6bc65c1648fe6b5f323094cf2b2dcc9dbbac361
---
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, 6 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/18/400118/1

diff --git a/puppet/modules/mediawiki/manifests/multiwiki.pp 
b/puppet/modules/mediawiki/manifests/multiwiki.pp
index a29bae8..6baf1d8 100644
--- a/puppet/modules/mediawiki/manifests/multiwiki.pp
+++ b/puppet/modules/mediawiki/manifests/multiwiki.pp
@@ -267,10 +267,6 @@
 file { '/usr/local/bin/sql':
 ensure  => link,
 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
-# mysql::packages.
-require => Package['mysql-server'],
+require => Package['mariadb-server'],
 }
 }
diff --git a/puppet/modules/mysql/manifests/init.pp 
b/puppet/modules/mysql/manifests/init.pp
index 113ce1f..f7b85da 100644
--- a/puppet/modules/mysql/manifests/init.pp
+++ b/puppet/modules/mysql/manifests/init.pp
@@ -24,11 +24,12 @@
 ) {
 include ::mysql::packages
 
-service { 'mysql':
+service { 'mariadb':
 ensure => running,
 enable => true,
+provider   => 'systemd',
 hasrestart => true,
-require=> Package['mysql-server'],
+require=> Package['mariadb-server'],
 }
 
 # Setup password free auth for VM's vagrant user
diff --git a/puppet/modules/mysql/manifests/large_prefix.pp 
b/puppet/modules/mysql/manifests/large_prefix.pp
index 1bce93d..568d47b 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'],
 notify  => Service['mysql'],
 }
 }
diff --git a/puppet/modules/mysql/manifests/packages.pp 
b/puppet/modules/mysql/manifests/packages.pp
index 73f0a65..46944ae 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':
 ensure => present,
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If6bc65c1648fe6b5f323094cf2b2dcc9dbbac361
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 

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