Ryan Lane has submitted this change and it was merged.
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, 10 insertions(+), 2 deletions(-)
Approvals:
Ryan Lane: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/salt.pp b/manifests/role/salt.pp
index 9e94636..b4dc542 100644
--- a/manifests/role/salt.pp
+++ b/manifests/role/salt.pp
@@ -96,7 +96,16 @@
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"
+ }
+ if ( $::salt_master_finger_override != undef ) {
+ $salt_master_finger = $::salt_master_finger_override
+ } else {
+ $salt_master_finger =
"c5:b1:35:45:3e:0a:19:70:aa:5f:3a:cf:bf:a0:61:dd"
+ }
$salt_client_id = "${dc}"
$salt_grains = {
"instanceproject" => $instanceproject,
@@ -104,7 +113,6 @@
"site" => $site,
"cluster" => $cluster,
}
- $salt_master_finger =
"c5:b1:35:45:3e:0a:19:70:aa:5f:3a:cf:bf:a0:61:dd"
} else {
$salt_master = "sockpuppet.pmtpa.wmnet"
$salt_client_id = "${fqdn}"
--
To view, visit https://gerrit.wikimedia.org/r/89494
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ied0af861c540981e72d02d30b929a6143b83a507
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
