[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: control db1082's mysqld_safe file with puppet

2016-09-15 Thread Jcrespo (Code Review) 
Jcrespo has submitted this change and it was merged.

Change subject: mariadb: control db1082's mysqld_safe file with puppet
..


mariadb: control db1082's mysqld_safe file with puppet

Also merge pending mariadb changes not yet live:
* mysqld_safe patches
* lvmbackup class

Bug: T145378
Change-Id: I9b1c56d7c0d6016fc8439c87f496bc6e6f3c126d
---
M manifests/role/mariadb.pp
M manifests/site.pp
M modules/mariadb
3 files changed, 16 insertions(+), 2 deletions(-)

Approvals:
  Jcrespo: Looks good to me, approved
  Marostegui: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index aafa9cc..97e74af 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -1044,3 +1044,10 @@
 ensure => latest,
 }
 }
+
+# control mysqld_safe with puppet instead of with
+# the mariadb package for flexibility
+class role::mariadb::custom_mysqld_safe {
+
+include mariadb::mysqld_safe
+}
diff --git a/manifests/site.pp b/manifests/site.pp
index 2b9b0f0..21d78d9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -547,7 +547,14 @@
 }
 }
 
-node /^db10(26|45|70|71|82|87|92)\.eqiad\.wmnet/ {
+node /^db10(26|45|70|71|87|92)\.eqiad\.wmnet/ {
+class { 'role::mariadb::core':
+shard => 's5',
+}
+}
+
+node 'db1082.eqiad.wmnet' {
+role mariadb::custom_mysqld_safe
 class { 'role::mariadb::core':
 shard => 's5',
 }
diff --git a/modules/mariadb b/modules/mariadb
index 40d8639..59ff34a 16
--- a/modules/mariadb
+++ b/modules/mariadb
@@ -1 +1 @@
-Subproject commit 40d86396f3494b57dc12bd6a6078998bc8975a44
+Subproject commit 59ff34a2157dea4ed27cc8aa1cef27a46a0948ea

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9b1c56d7c0d6016fc8439c87f496bc6e6f3c126d
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Muehlenhoff 
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: control db1082's mysqld_safe file with puppet

2016-09-14 Thread Jcrespo (Code Review) 
Jcrespo has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/310564

Change subject: mariadb: control db1082's mysqld_safe file with puppet
..

mariadb: control db1082's mysqld_safe file with puppet

Bug: T145378
Change-Id: I9b1c56d7c0d6016fc8439c87f496bc6e6f3c126d
---
M manifests/role/mariadb.pp
M manifests/site.pp
2 files changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/64/310564/1

diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index aafa9cc..97e74af 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -1044,3 +1044,10 @@
 ensure => latest,
 }
 }
+
+# control mysqld_safe with puppet instead of with
+# the mariadb package for flexibility
+class role::mariadb::custom_mysqld_safe {
+
+include mariadb::mysqld_safe
+}
diff --git a/manifests/site.pp b/manifests/site.pp
index cb869ec..7cdfc1c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -548,6 +548,7 @@
 }
 
 node /^db10(26|45|70|71|82|87|92)\.eqiad\.wmnet/ {
+role mariadb::custom_mysqld_safe
 class { 'role::mariadb::core':
 shard => 's5',
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b1c56d7c0d6016fc8439c87f496bc6e6f3c126d
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