Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5

This commit is contained in:
Colton Myers 2015-06-11 13:14:37 -06:00
commit f96c5029bb

View file

@ -144,7 +144,7 @@ to add them to the pool of load balanced servers.
<...file contents snipped...>
{% for server, addrs in salt['mine.get']('roles:web', 'network.ip_addrs', expr_form='grain').items() %}
{% for server, addrs in salt['mine.get']('roles:web', 'network.ip_addrs', expr_form='pillar').items() %}
server {{ server }} {{ addrs[0] }}:80 check
{% endfor %}