Ryan Lane has uploaded a new change for review.
https://gerrit.wikimedia.org/r/89494
Change subject: Add a salt master override for labs
......................................................................
Add a salt master override for labs
Some projects, like sartoris need to define a custom salt master
for testing salt applications. This change allows an override
for labs projects.
Change-Id: Ied0af861c540981e72d02d30b929a6143b83a507
---
M manifests/role/salt.pp
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/94/89494/1
diff --git a/manifests/role/salt.pp b/manifests/role/salt.pp
index 9e94636..d66d665 100644
--- a/manifests/role/salt.pp
+++ b/manifests/role/salt.pp
@@ -96,7 +96,11 @@
class role::salt::minions {
if ($realm == "labs") {
- $salt_master = "virt0.wikimedia.org"
+ if ( $::salt_master_override != undef ) {
+ $salt_master = $::salt_master_override
+ } else {
+ $salt_master = "virt0.wikimedia.org"
+ }
$salt_client_id = "${dc}"
$salt_grains = {
"instanceproject" => $instanceproject,
--
To view, visit https://gerrit.wikimedia.org/r/89494
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied0af861c540981e72d02d30b929a6143b83a507
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
