Merge "Add NeutronDnsDomain heat option, undercloud fix"

environments/undercloud.yaml

@@ -11,6 +11,7 @@ parameter_defaults:
   NeutronBridgeMappings: ctlplane:br-ctlplane
   NeutronAgentExtensions: []
   NeutronFlatNetworks: '*'
+  NeutronDnsDomain: ''
   NovaSchedulerAvailableFilters: 'tripleo_common.filters.list.tripleo_filters'
   NovaSchedulerDefaultFilters: ['RetryFilter', 'TripleOCapabilitiesFilter', 'ComputeCapabilitiesFilter', 'AvailabilityZoneFilter', 'RamFilter', 'DiskFilter', 'ComputeFilter', 'ImagePropertiesFilter', 'ServerGroupAntiAffinityFilter', 'ServerGroupAffinityFilter']
   NeutronDhcpAgentsPerNetwork: 2

puppet/services/neutron-base.yaml

@@ -30,6 +30,10 @@ parameters:
     type: number
     default: 0
     description: The number of neutron dhcp agents to schedule per network
+  NeutronDnsDomain:
+    type: string
+    default: openstacklocal
+    description: Domain to use for building the hostnames.
   NeutronCorePlugin:
     default: 'ml2'
     description: |
@@ -95,6 +99,7 @@ outputs:
             neutron::debug: {get_param: Debug}
             neutron::purge_config: {get_param: EnableConfigPurge}
             neutron::allow_overlapping_ips: true
+            neutron::dns_domain: {get_param: NeutronDnsDomain}
             neutron::rabbit_heartbeat_timeout_threshold: 60
             neutron::host: '%{::fqdn}'
             neutron::db::database_db_max_retries: -1