Volans has uploaded a new change for review.
https://gerrit.wikimedia.org/r/286303
Change subject: [TEST]: Allow to set additional grains for salt
......................................................................
[TEST]: Allow to set additional grains for salt
Change-Id: Idd88b7a4e892841be1616cbecd8c66a619ce206f
---
M hieradata/regex.yaml
M manifests/role/mariadb.pp
M modules/role/manifests/salt/minions.pp
3 files changed, 23 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/03/286303/1
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 6003b73..a62e015 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -61,6 +61,8 @@
mysql_eqiad:
__regex: !ruby/regexp
/^(db10[0-9][0-9]|dbstore100[1-2]|dbproxy100[1-8]|es101[1-9]|labsdb100[1-8])\.eqiad\.wmnet$/
cluster: mysql
+ salt::additional_grains:
+ test_additional_grain: test_additional_grain_value
mysql_codfw:
__regex: !ruby/regexp
/^(db20[0-9][0-9]|dbstore200[1-2]|es201[1-9])\.codfw\.wmnet$/
diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index 1810eaa..af9e8bb 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -500,6 +500,11 @@
description => "Core DB Server ${shard}",
}
+ $salt_additional_grains = {
+ 'mysql_role': $master ? { true => 'master', false => 'slave' },
+ 'mysql_shard': $shard,
+ }
+
include standard
include role::mariadb::grants
include role::mariadb::grants::core
diff --git a/modules/role/manifests/salt/minions.pp
b/modules/role/manifests/salt/minions.pp
index 01d490c..dbcc240 100644
--- a/modules/role/manifests/salt/minions.pp
+++ b/modules/role/manifests/salt/minions.pp
@@ -19,15 +19,26 @@
}
$client_id = $::fqdn
+ $grains = {
+ realm => $::realm,
+ site => $::site,
+ cluster => hiera('cluster', $::cluster),
+ }
+
+ $hiera_grains = hiera('salt::additional_grains', {})
+ if ($hiera_grains.length > 0) {
+ $grains.merge!($hiera_grains)
+ }
+
+ if ($::salt_additional_grains and $::salt_additional_grains.length > 0) {
+ $grains.merge!($::salt_additional_grains)
+ }
+
class { '::salt::minion':
id => $client_id,
master => $master,
master_finger => $master_finger,
master_key => $salt_master_key,
- grains => {
- realm => $::realm,
- site => $::site,
- cluster => hiera('cluster', $::cluster),
- },
+ grains => $grains,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/286303
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd88b7a4e892841be1616cbecd8c66a619ce206f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Volans <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
