Merge pull request #23 from daschatten/master

Fix some pillar paths for key "available_zones".
This commit is contained in:
Forrest 2015-02-19 15:15:59 -08:00
commit c5840f5e55
3 changed files with 8 additions and 7 deletions

View file

@ -130,7 +130,7 @@ bind_default_zones:
{% endif %}
{% for key,args in salt['pillar.get']('bind:configured_zones', {}).iteritems() -%}
{%- set file = salt['pillar.get']("available_zones:" + key + ":file") %}
{%- set file = salt['pillar.get']("bind:available_zones:" + key + ":file") %}
{% if args['type'] == "master" -%}
zones-{{ file }}:
file.managed:

View file

@ -8,8 +8,8 @@
//include "/etc/bind/zones.rfc1918";
{% for key,args in salt['pillar.get']('bind:configured_zones', {}).iteritems() -%}
{%- set file = salt['pillar.get']("available_zones:" + key + ":file") %}
{%- set masters = salt['pillar.get']("available_zones:" + key + ":masters") %}
{%- set file = salt['pillar.get']("bind:available_zones:" + key + ":file") %}
{%- set masters = salt['pillar.get']("bind:available_zones:" + key + ":masters") %}
zone "{{ key }}" {
type {{ args['type'] }};
{% if args['dnssec'] is defined and args['dnssec'] -%}

View file

@ -30,7 +30,8 @@ bind:
allow-update: "key core_dhcp"
notify: True
available_zones:
sub.domain.org:
file: db.sub.domain.org
masters: "192.168.0.1;"
bind:
available_zones:
sub.domain.org:
file: db.sub.domain.org
masters: "192.168.0.1;"