diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template
index 48c0486f4..267babce9 100644
--- a/elements/puppet-stack-config/puppet-stack-config.yaml.template
+++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template
@@ -237,7 +237,7 @@ neutron::debug: "%{hiera('debug')}"
 neutron::bind_host: {{LOCAL_IP}}
 neutron::core_plugin: ml2
 neutron::dhcp_agents_per_network: 2
-neutron::dns_domain: ''
+neutron::dns_domain: {{OVERCLOUD_DOMAIN_NAME}}
 neutron::server::api_workers: "%{::os_workers}"
 neutron::server::rpc_workers: "%{::os_workers}"
 neutron::rabbit_password: {{UNDERCLOUD_RABBIT_PASSWORD}}
@@ -405,7 +405,7 @@ nova::api_database_connection: mysql+pymysql://nova_api:{{UNDERCLOUD_NOVA_PASSWO
 nova::placement_database_connection: mysql+pymysql://nova_placement:{{UNDERCLOUD_NOVA_PASSWORD}}@{{LOCAL_IP}}/nova_placement
 nova::notify_on_state_change: 'vm_and_task_state'
 nova::scheduler::enabled: true
-nova::network::neutron::dhcp_domain: ''
+nova::network::neutron::dhcp_domain: {{OVERCLOUD_DOMAIN_NAME}}
 nova::compute::force_config_drive: true
 nova::compute::reserved_host_memory: '0'
 nova::compute::vnc_enabled: false
diff --git a/instack_undercloud/undercloud.py b/instack_undercloud/undercloud.py
index 937069f06..808968b7d 100644
--- a/instack_undercloud/undercloud.py
+++ b/instack_undercloud/undercloud.py
@@ -151,6 +151,12 @@ _opts = [
     cfg.ListOpt('undercloud_ntp_servers',
                 default=[],
                 help=('List of ntp servers to use.')),
+    cfg.StrOpt('overcloud_domain_name',
+               default='localdomain',
+               help=('DNS domain name to use when deploying the overcloud. '
+                     'The overcloud parameter "CloudDomain" must be set to a '
+                     'matching value.')
+               ),
     cfg.StrOpt('undercloud_service_certificate',
                default='',
                help=('Certificate file to use for OpenStack service SSL '
diff --git a/releasenotes/notes/set-dns-domain-08abe0d0fe7d2e65.yaml b/releasenotes/notes/set-dns-domain-08abe0d0fe7d2e65.yaml
new file mode 100644
index 000000000..ae69104da
--- /dev/null
+++ b/releasenotes/notes/set-dns-domain-08abe0d0fe7d2e65.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    The DNS domain for overcloud nodes can now be set in undercloud.conf
+    via the overcloud_domain_name option.  The same value used for this option
+    must be passed to the overcloud deploy in the CloudDomain parameter.
diff --git a/undercloud.conf.sample b/undercloud.conf.sample
index 036ab2a13..824084b3c 100644
--- a/undercloud.conf.sample
+++ b/undercloud.conf.sample
@@ -39,6 +39,11 @@
 # List of ntp servers to use. (list value)
 #undercloud_ntp_servers =
 
+# DNS domain name to use when deploying the overcloud. The overcloud
+# parameter "CloudDomain" must be set to a matching value. (string
+# value)
+#overcloud_domain_name = localdomain
+
 # Certificate file to use for OpenStack service SSL connections.
 # Setting this enables SSL for the OpenStack API endpoints, leaving it
 # unset disables SSL. (string value)