Alexandros Kosiaris has submitted this change and it was merged.
Change subject: salt: qualify site and realm
......................................................................
salt: qualify site and realm
Change-Id: If081e809b90bb8af304624e639e39b68b9331bf0
---
M manifests/role/salt.pp
1 file changed, 6 insertions(+), 6 deletions(-)
Approvals:
Hashar: Looks good to me, but someone else must approve
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/salt.pp b/manifests/role/salt.pp
index 242874a..ca33001 100644
--- a/manifests/role/salt.pp
+++ b/manifests/role/salt.pp
@@ -90,11 +90,11 @@
class role::salt::minions {
- if ($realm == "labs") {
+ if ($::realm == "labs") {
if ( $::salt_master_override != undef ) {
$salt_master = $::salt_master_override
} else {
- $salt_master = $site ? {
+ $salt_master = $::site ? {
"pmtpa" => ["virt0.wikimedia.org",
"virt1000.wikimedia.org"],
"eqiad" => ["virt1000.wikimedia.org",
"virt0.wikimedia.org"],
}
@@ -107,8 +107,8 @@
$salt_client_id = "${dc}"
$salt_grains = {
"instanceproject" => $instanceproject,
- "realm" => $realm,
- "site" => $site,
+ "realm" => $::realm,
+ "site" => $::site,
"cluster" => $cluster,
}
} else {
@@ -124,8 +124,8 @@
$salt_master = "palladium.eqiad.wmnet"
$salt_client_id = "${fqdn}"
$salt_grains = {
- "realm" => $realm,
- "site" => $site,
+ "realm" => $::realm,
+ "site" => $::site,
"cluster" => $cluster,
}
$salt_master_finger =
"f6:1d:a7:1f:7e:12:10:40:75:d5:73:af:0c:be:7d:7c"
--
To view, visit https://gerrit.wikimedia.org/r/119403
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If081e809b90bb8af304624e639e39b68b9331bf0
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
