Merge "Add config options to handle SOA records."

src/config.yaml

@@ -78,9 +78,42 @@ options:
     type: int
     default: 86400
     description: |
-      Default SOA expire value in seconds to specify how long a
+      Default SOA expire value (in seconds) to specify how long a
       secondary will still treat its copy of the zone data as valid if
       it can't contact the primary.
+  default-soa-minimum:
+    type: int
+    default:
+    description: |
+      Default SOA minimum value (in seconds) how long should cache a negative
+      response.
+  default-soa-refresh-min:
+    type: int
+    default:
+    description: |
+      SOA refresh indicates the time (in seconds) when the slave will try to
+      refresh the zone from the master, Designate randomizes the refresh time
+      using `default-soa-refresh-min` and `default-soa-refresh-max` as lower
+      and upper boundaries respectively.
+  default-soa-refresh-max:
+    type: int
+    default:
+    description: |
+      SOA refresh indicates the time (in seconds) when the slave will try to
+      refresh the zone from the master, Designate randomizes the refresh time
+      using `default-soa-refresh-min` and `default-soa-refresh-max` as lower
+      and upper boundaries respectively.
+  default-soa-retry:
+    type: int
+    default:
+    description: |
+      Defines the time (in seconds) between retries for the SOA record if the
+      slave (secondary) fails to contact the master when refresh has expired.
+  default-ttl:
+    type: int
+    default:
+    description: |
+      Default TTL (in seconds) for newly created zones.
   use-policyd-override:
     type: boolean
     default: False
@@ -94,4 +127,4 @@ options:
     default: 3600
     description: |
       Default for how old deleted zones should be (deleted_at) to be
-      purged, in seconds.
+      purged, in seconds.

src/templates/mitaka/designate.conf

@@ -28,6 +28,26 @@ debug = {{ options.debug }}
 # Which networking API to use, Defaults to neutron
 #network_api = neutron
 
+{%- if options.default_ttl %}
+# TTL Value (integer value)
+default_ttl = {{ options.default_ttl }}
+{%- endif %}
+{%- if options.default_soa_refresh_min %}
+# SOA refresh-min value (integer value)
+default_soa_refresh_min = {{ options.default_soa_refresh_min }}
+{%- endif %}
+{%- if options.default_soa_refresh_max %}
+# SOA max value (integer value)
+default_soa_refresh_max = {{ options.default_soa_refresh_max }}
+{%- endif %}
+{%- if options.default_soa_retry %}
+# SOA retry (integer value)
+default_soa_retry = {{ options.default_soa_retry }}
+{%- endif %}
+{%- if options.default_soa_minimum %}
+# SOA minimum value (integer value)
+default_soa_minimum = {{ options.default_soa_minimum }}
+{%- endif %}
 # SOA expire (integer value)
 default_soa_expire = {{ options.default_soa_expire }}
 

src/templates/queens/designate.conf

@@ -29,6 +29,26 @@ debug = {{ options.debug }}
 # Which networking API to use, Defaults to neutron
 #network_api = neutron
 
+{%- if options.default_ttl %}
+# TTL Value (integer value)
+default_ttl = {{ options.default_ttl }}
+{%- endif %}
+{%- if options.default_soa_refresh_min %}
+# SOA refresh-min value (integer value)
+default_soa_refresh_min = {{ options.default_soa_refresh_min }}
+{%- endif %}
+{%- if options.default_soa_refresh_max %}
+# SOA max value (integer value)
+default_soa_refresh_max = {{ options.default_soa_refresh_max }}
+{%- endif %}
+{%- if options.default_soa_retry %}
+# SOA retry (integer value)
+default_soa_retry = {{ options.default_soa_retry }}
+{%- endif %}
+{%- if options.default_soa_minimum %}
+# SOA minimum value (integer value)
+default_soa_minimum = {{ options.default_soa_minimum }}
+{%- endif %}
 # SOA expire (integer value)
 default_soa_expire = {{ options.default_soa_expire }}
 

src/templates/rocky/designate.conf

@@ -29,6 +29,29 @@ debug = {{ options.debug }}
 # Which networking API to use, Defaults to neutron
 #network_api = neutron
 
+{%- if options.default_ttl %}
+# TTL Value (integer value)
+default_ttl = {{ options.default_ttl }}
+{%- endif %}
+{%- if options.default_soa_refresh_min %}
+# SOA refresh-min value (integer value)
+default_soa_refresh_min = {{ options.default_soa_refresh_min }}
+{%- endif %}
+{%- if options.default_soa_refresh_max %}
+# SOA max value (integer value)
+default_soa_refresh_max = {{ options.default_soa_refresh_max }}
+{%- endif %}
+{%- if options.default_soa_retry %}
+# SOA retry (integer value)
+default_soa_retry = {{ options.default_soa_retry }}
+{%- endif %}
+{%- if options.default_soa_minimum %}
+# SOA minimum value (integer value)
+default_soa_minimum = {{ options.default_soa_minimum }}
+{%- endif %}
+# SOA expire (integer value)
+default_soa_expire = {{ options.default_soa_expire }}
+
 {% include "parts/section-transport-url" %}
 
 #-----------------------