[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Remove installation of percona-xtrabackup on stretch

2017-06-22 Thread Jcrespo (Code Review) 
Jcrespo has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/360859 )

Change subject: mariadb: Remove installation of percona-xtrabackup on stretch
..


mariadb: Remove installation of percona-xtrabackup on stretch

Percona-xtrabackup has been removed from debian stretch. Maybe
mariabackup (a for of xtrabackup), included on the wmf mariadb
package, could be enough. Maybe it has to be forward-ported later?

For now disable it everywhere, except on packages.pp, which
probably has to be deleted completely.

Bug: T168356
Change-Id: Iddbcab76b8f3289cc529f8c0fe17f487990ee6b2
---
M modules/mariadb/manifests/packages_client.pp
M modules/mariadb/manifests/packages_wmf.pp
2 files changed, 16 insertions(+), 3 deletions(-)

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



diff --git a/modules/mariadb/manifests/packages_client.pp 
b/modules/mariadb/manifests/packages_client.pp
index 443924a..300d9db 100644
--- a/modules/mariadb/manifests/packages_client.pp
+++ b/modules/mariadb/manifests/packages_client.pp
@@ -7,7 +7,6 @@
 package { [
 'wmf-mariadb101-client', # mariadb client, custom wmf package
 'percona-toolkit',   # very useful client utilities
-'percona-xtrabackup',# backup tool, useful even outside of the 
server
 'grc',   # used to colorize paged sql output
 'python3-pymysql',   # dependency for some utilities- TODO: delete 
& add as dependency
 'python3-tabulate',  # dependency for some utilities- TODO: delete 
& add as dependency
@@ -15,6 +14,14 @@
 ensure => present,
 }
 
+# Do not try to install xtrabackup on stretch, it has been removed.
+# Maybe mariabackup is enough?
+if (os_version('debian < stretch || ubuntu >= trusty')) {
+package { 'percona-xtrabackup':
+ensure => present,
+}
+}
+
 if os_version('debian < stretch') {
 package { [
 'colordiff', # useful to colorize diff output, use 
diff --color in strech
diff --git a/modules/mariadb/manifests/packages_wmf.pp 
b/modules/mariadb/manifests/packages_wmf.pp
index 58c7fef..71df1fc 100644
--- a/modules/mariadb/manifests/packages_wmf.pp
+++ b/modules/mariadb/manifests/packages_wmf.pp
@@ -11,7 +11,6 @@
 package { [
 'libaio1',# missing dependency on packages < 10.0.27
 'percona-toolkit',
-'percona-xtrabackup',
 'libjemalloc1',   # missing dependency on packages < 10.0.27
 'pigz',
 'grc',
@@ -19,7 +18,14 @@
 ensure => present,
 }
 
-# mariadb10 parameter is deprecated, and it will be eliminates as soon
+# Do not try to install xtrabackup on stretch, it has been removed.
+# Maybe mariabackup is enough?
+if (os_version('debian < stretch || ubuntu >= trusty')) {
+package { 'percona-xtrabackup':
+ensure => present,
+}
+}
+# mariadb10 parameter is deprecated, and it will be eliminated as soon
 # as the last mariadb 5.5 server is upgraded
 if ($mariadb10 == false) {
 package { 'wmf-mariadb':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iddbcab76b8f3289cc529f8c0fe17f487990ee6b2
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Remove installation of percona-xtrabackup on stretch

2017-06-22 Thread Jcrespo (Code Review) 
Jcrespo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/360859 )

Change subject: mariadb: Remove installation of percona-xtrabackup on stretch
..

mariadb: Remove installation of percona-xtrabackup on stretch

Percona-xtrabackup has been removed from debian stretch. Maybe
mariabackup (a for of xtrabackup), included on the wmf mariadb
package, could be enough. Maybe it has to be forward-ported later?

For now disable it everywhere, except on packages.pp, which
probably has to be deleted completely.

Bug: T168356
Change-Id: Iddbcab76b8f3289cc529f8c0fe17f487990ee6b2
---
M modules/mariadb/manifests/packages_client.pp
M modules/mariadb/manifests/packages_wmf.pp
2 files changed, 16 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/59/360859/1

diff --git a/modules/mariadb/manifests/packages_client.pp 
b/modules/mariadb/manifests/packages_client.pp
index 443924a..300d9db 100644
--- a/modules/mariadb/manifests/packages_client.pp
+++ b/modules/mariadb/manifests/packages_client.pp
@@ -7,7 +7,6 @@
 package { [
 'wmf-mariadb101-client', # mariadb client, custom wmf package
 'percona-toolkit',   # very useful client utilities
-'percona-xtrabackup',# backup tool, useful even outside of the 
server
 'grc',   # used to colorize paged sql output
 'python3-pymysql',   # dependency for some utilities- TODO: delete 
& add as dependency
 'python3-tabulate',  # dependency for some utilities- TODO: delete 
& add as dependency
@@ -15,6 +14,14 @@
 ensure => present,
 }
 
+# Do not try to install xtrabackup on stretch, it has been removed.
+# Maybe mariabackup is enough?
+if (os_version('debian < stretch || ubuntu >= trusty')) {
+package { 'percona-xtrabackup':
+ensure => present,
+}
+}
+
 if os_version('debian < stretch') {
 package { [
 'colordiff', # useful to colorize diff output, use 
diff --color in strech
diff --git a/modules/mariadb/manifests/packages_wmf.pp 
b/modules/mariadb/manifests/packages_wmf.pp
index 58c7fef..71df1fc 100644
--- a/modules/mariadb/manifests/packages_wmf.pp
+++ b/modules/mariadb/manifests/packages_wmf.pp
@@ -11,7 +11,6 @@
 package { [
 'libaio1',# missing dependency on packages < 10.0.27
 'percona-toolkit',
-'percona-xtrabackup',
 'libjemalloc1',   # missing dependency on packages < 10.0.27
 'pigz',
 'grc',
@@ -19,7 +18,14 @@
 ensure => present,
 }
 
-# mariadb10 parameter is deprecated, and it will be eliminates as soon
+# Do not try to install xtrabackup on stretch, it has been removed.
+# Maybe mariabackup is enough?
+if (os_version('debian < stretch || ubuntu >= trusty')) {
+package { 'percona-xtrabackup':
+ensure => present,
+}
+}
+# mariadb10 parameter is deprecated, and it will be eliminated as soon
 # as the last mariadb 5.5 server is upgraded
 if ($mariadb10 == false) {
 package { 'wmf-mariadb':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iddbcab76b8f3289cc529f8c0fe17f487990ee6b2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo 

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