Merge pull request #22 from smlloyd/master

Fix overwriting dictionary with pillar data.
2015-01-12 09:44:56 +01:00 · 2015-01-12 09:44:56 +01:00 · 4098e46527
parent 1ecdcc5a9b 34f3aed102
commit 4098e46527
1 changed files with 1 additions and 1 deletions
--- a/sudoers/included.sls
+++ b/sudoers/included.sls
@ -3,7 +3,7 @@
 include:
  - sudoers

-{% set sudoers = pillar.get('sudoers', {}) %}
+{% do sudoers.update(pillar.get('sudoers', {})) %}
 {% set included_files = sudoers.get('included_files', {}) %}
 {% for included_file,spec in included_files.items() -%}
 {{ included_file }}: