Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154347
Change subject: salt - minion.erb - fix compiler warnings
......................................................................
salt - minion.erb - fix compiler warnings
Warning: Variable access via 'salt_master' is deprecated.
Use '@salt_master' instead.
(at /modules/salt/templates/minion.erb:11:in `result')
Warning: Variable access via 'salt_master' is deprecated.
Use '@salt_master' instead.
(at /modules/salt/templates/minion.erb:17:in `result')
Warning: Variable access via 'salt_client_id' is deprecated.
Use '@salt_client_id' instead.
(at /modules/salt/templates/minion.erb:46:in `result')
Warning: Variable access via 'salt_grains' is deprecated.
Use '@salt_grains' instead.
(at /modules/salt/templates/minion.erb:63:in `result')
Warning: Variable access via 'salt_grains' is deprecated.
Use '@salt_grains' instead.
(at /modules/salt/templates/minion.erb:64:in `result')
Warning: Variable access via 'salt_dns_check' is deprecated.
Use '@salt_dns_check' instead.
(at /modules/salt/templates/minion.erb:118:in `result')
Warning: Variable access via 'salt_master_finger' is deprecated.
Use '@salt_master_finger' instead.
(at /puppet/modules/salt/templates/minion.erb:300:in `result')
Change-Id: I5dd0ad6909091893e2d1dc9e9cd232f1e0472355
---
M modules/salt/templates/minion.erb
1 file changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/47/154347/1
diff --git a/modules/salt/templates/minion.erb
b/modules/salt/templates/minion.erb
index b324632..c57e495 100644
--- a/modules/salt/templates/minion.erb
+++ b/modules/salt/templates/minion.erb
@@ -8,13 +8,13 @@
# 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 -%>
-master: <%= salt_master %>
+master: <%= @salt_master %>
<% end -%>
# Set the number of seconds to wait before attempting to resolve
@@ -43,7 +43,7 @@
# Since salt uses detached ids it is possible to run multiple minions on the
# same machine but with different ids, this can be useful for salt compute
# clusters.
-<% if @salt_master %>id: <%= salt_client_id %><% end %>
+<% if @salt_master %>id: <%= @salt_client_id %><% end %>
# Append a domain to a hostname in the event that it does not exist. This is
# useful for systems where socket.getfqdn() does not actually result in a
@@ -60,8 +60,8 @@
# deployment: datacenter4
# cabinet: 13
# cab_u: 14-15
-<% if salt_grains != {} %>
-grains:<% salt_grains.sort.each do |salt_name, salt_values| %>
+<% if @salt_grains != {} %>
+grains:<% @salt_grains.sort.each do |salt_name, salt_values| %>
<% if salt_values.kind_of?(Array) %> <%= salt_name %>:<%
salt_values.sort.each do |salt_value| %>
- <%= salt_value %><% end %><% else %> <%= salt_name %>: <%= salt_values
%><% end %><% end %><% end %>
@@ -115,7 +115,7 @@
# When healing, a dns_check is run. This is to make sure that the originally
# resolved dns has not changed. If this is something that does not happen in
# your environment, set this value to False.
-<% if @salt_dns_check %>dns_check: <%= salt_dns_check %><% end %>
+<% if @salt_dns_check %>dns_check: <%= @salt_dns_check %><% end %>
# Windows platforms lack posix IPC and must rely on slower TCP based inter-
# process communications. Set ipc_mode to 'tcp' on such systems
@@ -297,7 +297,7 @@
# Fingerprint of the master public key to double verify the master is valid,
# the master fingerprint can be found by running "salt-key -F master" on the
# salt master.
-<%if @salt_master_finger %>master_finger: <%= salt_master_finger %><% end %>
+<%if @salt_master_finger %>master_finger: <%= @salt_master_finger %><% end %>
###### Thread settings #####
###########################################
--
To view, visit https://gerrit.wikimedia.org/r/154347
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5dd0ad6909091893e2d1dc9e9cd232f1e0472355
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
