Springle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/98140
Change subject: pc1001 upgrade to mariadb
......................................................................
pc1001 upgrade to mariadb
Add wikimedia-mariadb.list to mysql_wmf on 12.04
Use the same known-to-work package setup as coredb
Change-Id: Id7256153333ff2d80aa7d6b93a774555518c5f4a
---
M manifests/site.pp
A modules/mysql_wmf/files/wikimedia-mariadb.list
M modules/mysql_wmf/manifests/packages.pp
3 files changed, 61 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/40/98140/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 3174fb4..67fafca 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2176,13 +2176,19 @@
}
node /pc([1-3]\.pmtpa|100[1-3]\.eqiad)\.wmnet/ {
- include role::db::core,
- mysql_wmf::mysqluser,
- mysql_wmf::datadirs,
- mysql_wmf::pc::conf,
- mysql_wmf::packages
- system::role { "mysql::pc::conf": description => "parser cache mysql server"
}
+ include role::db::core,
+ mysql_wmf::mysqluser,
+ mysql_wmf::datadirs,
+ mysql_wmf::pc::conf
+
+ if $::hostname =~ /^pc10(01)/ {
+ class { mysql_wmf::packages : mariadb => true }
+ } else {
+ include mysql_wmf::packages
+ }
+
+ system::role { "mysql::pc::conf": description => "parser cache mysql
server" }
}
node "pdf1.wikimedia.org" {
diff --git a/modules/mysql_wmf/files/wikimedia-mariadb.list
b/modules/mysql_wmf/files/wikimedia-mariadb.list
new file mode 100644
index 0000000..305a67d
--- /dev/null
+++ b/modules/mysql_wmf/files/wikimedia-mariadb.list
@@ -0,0 +1,2 @@
+deb http://apt.wikimedia.org/wikimedia precise-wikimedia mariadb
+deb-src http://apt.wikimedia.org/wikimedia precise-wikimedia mariadb
diff --git a/modules/mysql_wmf/manifests/packages.pp
b/modules/mysql_wmf/manifests/packages.pp
index f51ec10..c97a73d 100644
--- a/modules/mysql_wmf/manifests/packages.pp
+++ b/modules/mysql_wmf/manifests/packages.pp
@@ -1,4 +1,3 @@
-# mysql.pp
# These classes contain a bunch of stuff that's specific to
# the wmf production DB systems. If you want to construct
@@ -8,36 +7,60 @@
$mariadb = false,
) {
- # TODO: Can we strip out this lucid code?
- if $::lsbdistid == 'Ubuntu' and versioncmp($::lsbdistrelease, '10.04') ==
0 {
- file { '/etc/apt/sources.list.d/wikimedia-mysql.list':
- owner => root,
- group => root,
- mode => '0444',
- source => 'puppet:///modules/mysql_wmf/wikimedia-mysql.list'
- }
- exec { 'update_mysql_apt':
- subscribe =>
File['/etc/apt/sources.list.d/wikimedia-mysql.list'],
- command => '/usr/bin/apt-get update',
- refreshonly => true;
- }
- package { [ 'mysql-client-5.1', 'mysql-server-core-5.1',
'mysql-server-5.1', 'libmysqlclient16' ]:
- ensure => '5.1.53-fb3753-wm1',
- require => File['/etc/apt/sources.list.d/wikimedia-mysql.list'];
- }
- }
if $::lsbdistid == 'Ubuntu' and versioncmp($::lsbdistrelease, '12.04') >=
0 {
- if $mariadb {
- package { [ 'mariadb-client-5.5', 'mariadb-server-core-5.5',
'mariadb-server-5.5', 'libmariadbclient18' ]:
- ensure => '5.5.28-mariadb-wmf201212041~precise',
+ if $mariadb == true {
+ file { '/etc/apt/sources.list.d/wikimedia-mariadb.list':
+ group => 'root',
+ mode => '0444',
+ owner => 'root',
+ source => 'puppet:///modules/mysql_wmf/wikimedia-mariadb.list',
}
+
+ exec { 'update_mysql_apt':
+ subscribe =>
File['/etc/apt/sources.list.d/wikimedia-mariadb.list'],
+ command => '/usr/bin/apt-get update',
+ refreshonly => true,
+ }
+
+ package { [
+ 'libmariadbclient18',
+ 'mariadb-client-5.5',
+ 'mariadb-server-5.5',
+ 'mariadb-server-core-5.5',
+ ]:
+ ensure => present,
+ require =>
File['/etc/apt/sources.list.d/wikimedia-mariadb.list'],
+ }
+
} else {
- package { [ 'mysqlfb-client-5.1', 'mysqlfb-server-core-5.1',
'mysqlfb-server-5.1', 'libmysqlfbclient16' ]:
+ package { [
+ 'libmysqlfbclient16',
+ 'mysqlfb-client-5.1',
+ 'mysqlfb-server-5.1',
+ 'mysqlfb-server-core-5.1',
+ ]:
ensure => '5.1.53-fb3875-wm1',
}
}
}
- package { ['percona-xtrabackup', 'percona-toolkit', 'libaio1', 'lvm2' ]:
+
+ if $::lsbdistid == 'Ubuntu' and versioncmp($::lsbdistrelease, '10.04') ==
0 {
+ package { [
+ 'libmysqlclient16',
+ 'mysql-client-5.1',
+ 'mysql-server-5.1',
+ 'mysql-server-core-5.1',
+ ]:
+ ensure => '5.1.53-fb3753-wm1',
+ }
+ }
+
+ package { [
+ 'libaio1',
+ 'lvm2',
+ 'percona-toolkit',
+ 'percona-xtrabackup',
+ ]:
ensure => latest,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/98140
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id7256153333ff2d80aa7d6b93a774555518c5f4a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
