Bug in beacons.conf (only with salt 2016.11.2)

[BernhardGruen]

Hi,

I've just upgraded one minion to 2016.11.2 and there is a bug in the beacons.conf Jinja template:
Current (original) template:

{%- set beacons = salt['pillar.get']('salt:beacons') -%}
{%- set beacons = salt['pillar.get']('salt:minion:beacons', default=beacons, merge=True) -%}
{%- if beacons %}
beacons:
  {{ beacons | yaml(False) | indent(2) }}
{%- endif -%}

Getting the following error:

              Unable to manage file: Problem running salt function in Jinja template: default must be a dictionary when merge=True; line 5            
              ---
              {%- set beacons = salt['pillar.get']('salt:beacons') -%}
              {%- set beacons = salt['pillar.get']('salt:minion:beacons', default=beacons, merge=True) -%}    <======================

Proposed solution (added a default value to the first beacons line):

#
# This file is managed by Salt! Do not edit by hand!
#
{%- set beacons = salt['pillar.get']('salt:beacons', default={}) -%}
{%- set beacons = salt['pillar.get']('salt:minion:beacons', default=beacons, merge=True) -%}
{%- if beacons %}
beacons:
  {{ beacons | yaml(False) | indent(2) }}
{%- endif -%}

I hope this simple bugfix helps someone.

Bernhard J. M. Grün

[aboe76]

See:
#288

[aboe76]

fixed with merged.