Faidon Liambotis has submitted this change and it was merged.
Change subject: Temporarily disable multi-master salt
......................................................................
Temporarily disable multi-master salt
Change-Id: Ie3c8426ac2a19175580c1b4d26faa5e0eab4ded1
---
M manifests/role/salt.pp
M modules/salt/templates/minion.erb
2 files changed, 15 insertions(+), 6 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/salt.pp b/manifests/role/salt.pp
index 64aa816..3b30486 100644
--- a/manifests/role/salt.pp
+++ b/manifests/role/salt.pp
@@ -120,7 +120,16 @@
"cluster" => $cluster,
}
} else {
- $salt_master = [ "sockpuppet.pmtpa.wmnet",
"palladium.eqiad.wmnet" ]
+ ## Disabling multi-master salt for now, until synchronization
+ ## issues are handled for puppet managing salt.
+ ## When minions fetch modules/returners/pillars/etc. it's
necessary
+ ## for both salt masters to have the same sets of data or
inconsistencies
+ ## can occur.
+ #$salt_master = $site ? {
+ # "pmtpa" => [ "sockpuppet.pmtpa.wmnet",
"palladium.eqiad.wmnet" ],
+ # "eqiad" => [ "palladium.eqiad.wmnet",
"sockpuppet.pmtpa.wmnet" ],
+ #}
+ $salt_master = "palladium.eqiad.wmnet"
$salt_client_id = "${fqdn}"
$salt_grains = {
"realm" => $realm,
diff --git a/modules/salt/templates/minion.erb
b/modules/salt/templates/minion.erb
index 100cfa6..b324632 100644
--- a/modules/salt/templates/minion.erb
+++ b/modules/salt/templates/minion.erb
@@ -8,14 +8,14 @@
# Set the location of the salt master server, if the master server cannot be
# resolved, then the minion will fail to start.
-<% if salt_master.is_a? Array %>
+<% if salt_master.is_a? Array -%>
master:
-<% salt_master.each do |name| %>
+<% salt_master.each do |name| -%>
- <%= name %>
-<% end %>
-<% else %>
+<% end -%>
+<% else -%>
master: <%= salt_master %>
-<% end %>
+<% end -%>
# Set the number of seconds to wait before attempting to resolve
# the master hostname if name resolution fails. Defaults to 30 seconds.
--
To view, visit https://gerrit.wikimedia.org/r/111746
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3c8426ac2a19175580c1b4d26faa5e0eab4ded1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane <rl...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
