feat: add bind_options variable

README.md

@@ -20,6 +20,7 @@ This role can work on Debian derived OS, but it's not our priority.
 ## Role variables
 
 * `bind_role` - the role `master` or `slave`, don't generate dnssec key on `slave`
+* `bind_options` - hash general bind options
 * `bind_zones` - the dns zones
 * `bind_listen_ipv4` - enable or disable ip v4 support (default: true)
 * `bind_listen_ipv6` - enable or disable ip v6 support (default: true)
@@ -40,6 +41,8 @@ This role can work on Debian derived OS, but it's not our priority.
  ```
 bind_listen_ipv6: true
 bind_listen_ipv4: true
+bind_options:
+  server-id: '"1"'
 
 bind_zones:
   test.local:
@@ -47,6 +50,10 @@ bind_zones:
     mail: root@test.local
     serial: 2017092202
     dnssec: yes
+    options:
+      key-directory: '"/etc/bind/keys"'
+      auto-dnssec: maintain
+      inline-signing: yes
     records:
       - { name: '@', type: ns, value: localhost. }
       - { name: hello, type: a, ttl: 5m, value: 1.2.3.4 }
@@ -56,10 +63,6 @@ bind_zones:
     mail: root@hello.local
     serial: 2017092201
     dnssec: no
-    options:
-      key-directory: '"/etc/bind/keys"'
-      auto-dnssec: maintain
-      inline-signing: yes
     records:
       - { name: '@', type: ns, value: localhost. }
       - { name: hello, type: a, value: 4.3.2.1 }

defaults/main.yml

@@ -1,3 +1,5 @@
 ---
+bind_role: master
 bind_listen_ipv4: true
 bind_listen_ipv6: true
+bind_options: {}

templates/named.conf.options.j2

@@ -11,5 +11,9 @@ options {
   listen-on { {% if bind_listen_ipv4 %}any{% else %}none{% endif %}; };
   listen-on-v6 { {% if bind_listen_ipv6 %}any{% else %}none{% endif %}; };
 
+{% for option,  value in bind_options.iteritems() %}
+  {{ option }} {% if value == True %}yes{% elif value == False %}no{% else %}{{ value }}{% endif %};
+{% endfor %}
+
   version none;
 };

test/integration/bind/default.yml

@@ -3,6 +3,8 @@
   vars:
     bind_listen_ipv6: false
     bind_role: master
+    bind_options:
+      server-id: '"1"'
     bind_zones:
       test.local:
         allow_transfer:

test/integration/bind/serverspec/bind_spec.rb

@@ -45,6 +45,7 @@ describe file('/etc/bind/named.conf.options') do
   it { should be_grouped_into 'root' }
   it { should contain 'listen-on { any; };' }
   it { should contain 'listen-on-v6 { none; };' }
+  it { should contain 'server-id "1";' }
 end
 
 describe service('bind9') do