2
0

Merge pull request #288 from aboe76/fix_beacons

fix beacons on dev
This commit is contained in:
Niels Abspoel 2017-02-01 22:53:44 +01:00 committed by GitHub
commit a26e82f530

View File

@ -1,7 +1,7 @@
# #
# This file is managed by Salt! Do not edit by hand! # This file is managed by Salt! Do not edit by hand!
# #
{%- set beacons = salt['pillar.get']('salt:beacons') -%} {%- set beacons = salt['pillar.get']('salt:beacons', {}) -%}
{%- set beacons = salt['pillar.get']('salt:minion:beacons', default=beacons, merge=True) -%} {%- set beacons = salt['pillar.get']('salt:minion:beacons', default=beacons, merge=True) -%}
{%- if beacons %} {%- if beacons %}
beacons: beacons: