diff --git a/etc/openstack_deploy/user_variables.yml b/etc/openstack_deploy/user_variables.yml
index 477dff12c3..c52cf3d4f3 100644
--- a/etc/openstack_deploy/user_variables.yml
+++ b/etc/openstack_deploy/user_variables.yml
@@ -58,6 +58,9 @@ glance_swift_store_endpoint_type: internalURL
 # nova_cpu_allocation_ratio: 2.0
 # nova_ram_allocation_ratio: 1.0
 
+# If you wish to change the dhcp_domain configured for both nova and neutron
+# dhcp_domain:
+
 ## Glance with Swift
 ### Extra options when configuring swift as a glance back-end.
 ### By default it will use the local swift install
diff --git a/playbooks/inventory/group_vars/hosts.yml b/playbooks/inventory/group_vars/hosts.yml
index 7fe9771a7e..0088f82c2b 100644
--- a/playbooks/inventory/group_vars/hosts.yml
+++ b/playbooks/inventory/group_vars/hosts.yml
@@ -69,6 +69,8 @@ memcached_servers: "{% for host in groups['memcached'] %}{{ hostvars[host]['ansi
 ## Region Name
 service_region: RegionOne
 
+## DHCP Domain Name
+dhcp_domain: openstacklocal
 
 ## OpenStack global Endpoint Protos
 #openstack_service_publicuri_proto: http
@@ -85,6 +87,7 @@ ceilometer_service_adminuri: "{{ ceilometer_service_proto }}://{{ internal_lb_vi
 ceilometer_service_adminurl: "{{ ceilometer_service_adminuri }}/"
 ceilometer_service_region: "{{ service_region }}"
 
+
 ## Nova
 nova_service_port: 8774
 nova_service_proto: http
@@ -100,6 +103,7 @@ nova_metadata_port: 8775
 nova_keystone_auth_plugin: password
 nova_ceph_client: '{{ cinder_ceph_client }}'
 nova_ceph_client_uuid: '{{ cinder_ceph_client_uuid | default() }}'
+nova_dhcp_domain: "{{ dhcp_domain }}"
 
 
 ## Neutron
@@ -119,6 +123,7 @@ neutron_service_l3_program_enabled: true
 neutron_service_linuxbridge_program_enabled: true
 neutron_service_metadata_program_enabled: true
 neutron_service_metering_program_enabled: true
+neutron_dhcp_domain: "{{ dhcp_domain }}"
 
 
 ## Glance
diff --git a/playbooks/roles/os_nova/defaults/main.yml b/playbooks/roles/os_nova/defaults/main.yml
index 22281eec6d..ab00f9c8a6 100644
--- a/playbooks/roles/os_nova/defaults/main.yml
+++ b/playbooks/roles/os_nova/defaults/main.yml
@@ -204,6 +204,7 @@ nova_max_age: 0
 nova_remove_unused_resized_minimum_age_seconds: 3600
 nova_image_cache_manager_interval: 0
 nova_resume_guests_state_on_host_boot: False
+nova_dhcp_domain: novalocal
 
 # Nova quota
 nova_quota_cores: 20
@@ -253,7 +254,7 @@ nova_ceph_client_uuid: 517a4663-3927-44bc-9ea7-4a90e1cd4c66
 nova_libvirt_disk_cachemodes: '{{ nova_libvirt_images_rbd_pool is defined | ternary("network=writeback", "") }}'
 nova_libvirt_hw_disk_discard: '{{ nova_libvirt_images_rbd_pool is defined | ternary("unmap", "ignore") }}'
 
-## General Neutron configuration
+## General Nova configuration
 # If ``nova_osapi_compute_workers`` is unset the system will use half the number of available VCPUS to
 # compute the number of api workers to use.
 # nova_osapi_compute_workers: 16
diff --git a/playbooks/roles/os_nova/templates/nova.conf.j2 b/playbooks/roles/os_nova/templates/nova.conf.j2
index c1c31dd66f..a5bf97c3aa 100644
--- a/playbooks/roles/os_nova/templates/nova.conf.j2
+++ b/playbooks/roles/os_nova/templates/nova.conf.j2
@@ -83,6 +83,7 @@ metadata_port = {{ nova_metadata_port }}
 metadata_workers = {{ nova_metadata_workers | default(api_threads) }}
 
 # Network
+dhcp_domain = {{ nova_dhcp_domain }}
 force_dhcp_release = True
 dhcpbridge_flagfile = /etc/nova/nova.conf
 firewall_driver = {{ nova_firewall_driver }}