[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Remove custom salt grains due to salt deprecation

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

Change subject: mariadb: Remove custom salt grains due to salt deprecation
..


mariadb: Remove custom salt grains due to salt deprecation

Bug: T164780
Change-Id: Ie5dc2142035eb85cc1b345b43dbe6e6e936337b2
---
M modules/role/manifests/mariadb.pp
1 file changed, 0 insertions(+), 20 deletions(-)

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



diff --git a/modules/role/manifests/mariadb.pp 
b/modules/role/manifests/mariadb.pp
index f25b041..4b86840 100644
--- a/modules/role/manifests/mariadb.pp
+++ b/modules/role/manifests/mariadb.pp
@@ -159,26 +159,6 @@
 $socket = '/run/mysqld/mysqld.sock',
 ) {
 
-salt::grain { 'mysql_group':
-ensure  => present,
-replace => true,
-value   => $mysql_group,
-}
-
-salt::grain { 'mysql_role':
-ensure  => present,
-replace => true,
-value   => $mysql_role,
-}
-
-if $mysql_shard != '' {
-salt::grain { 'mysql_shard':
-ensure  => present,
-replace => true,
-value   => $mysql_shard,
-}
-}
-
 include role::prometheus::node_exporter
 class { 'role::prometheus::mysqld_exporter':
 socket => $socket,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5dc2142035eb85cc1b345b43dbe6e6e936337b2
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Volans 
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 custom salt grains due to salt deprecation

2017-08-10 Thread Jcrespo (Code Review) 
Jcrespo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370993 )

Change subject: mariadb: Remove custom salt grains due to salt deprecation
..

mariadb: Remove custom salt grains due to salt deprecation

Bug: T164780
Change-Id: Ie5dc2142035eb85cc1b345b43dbe6e6e936337b2
---
M modules/role/manifests/mariadb.pp
1 file changed, 0 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/93/370993/1

diff --git a/modules/role/manifests/mariadb.pp 
b/modules/role/manifests/mariadb.pp
index f25b041..4b86840 100644
--- a/modules/role/manifests/mariadb.pp
+++ b/modules/role/manifests/mariadb.pp
@@ -159,26 +159,6 @@
 $socket = '/run/mysqld/mysqld.sock',
 ) {
 
-salt::grain { 'mysql_group':
-ensure  => present,
-replace => true,
-value   => $mysql_group,
-}
-
-salt::grain { 'mysql_role':
-ensure  => present,
-replace => true,
-value   => $mysql_role,
-}
-
-if $mysql_shard != '' {
-salt::grain { 'mysql_shard':
-ensure  => present,
-replace => true,
-value   => $mysql_shard,
-}
-}
-
 include role::prometheus::node_exporter
 class { 'role::prometheus::mysqld_exporter':
 socket => $socket,

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

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