Merge "Disable recursion in Designate-managed BIND"

environments/enable-designate.yaml

@@ -13,6 +13,12 @@
 #   configuration values for other services to allow them to integrate with
 #   Designate.
 parameter_defaults:
+  # If True, enable the internal Neutron DNS server that provides name
+  # resolution between VMs.  This parameter has no effect if
+  # NeutronDhcpAgentDnsmasqDnsServers is set.
+  # Type: boolean
+  NeutronEnableInternalDNS: True
+
   # Comma-separated list of extensions enabled for the Neutron plugin.
   # Type: comma_delimited_list
   NeutronPluginExtensions: qos,port_security,dns

puppet/services/designate-worker.yaml

@@ -70,6 +70,7 @@ outputs:
         - get_attr: [DesignateBase, role_data, config_settings]
         - designate::worker::worker_notify: true
           dns::vardir: /var/named-persistent
+          dns::recursion: 'no'
           dns::additional_options:
             listen-on:
               str_replace:

sample-env-generator/enable-services.yaml

@@ -19,5 +19,9 @@ environments:
       puppet/services/neutron-plugin-ml2.yaml:
         parameters:
           - NeutronPluginExtensions
+      puppet/services/neutron-dhcp.yaml:
+        parameters:
+          - NeutronEnableInternalDNS
     sample_values:
       NeutronPluginExtensions: qos,port_security,dns
+      NeutronEnableInternalDNS: True