diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml
index c27ee3c..463fefd 100644
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@@ -11,6 +11,7 @@
       version: ${_param:nova_version}
       vncproxy_url: ${_param:nova_vncproxy_url}
       security_group: false
+      dhcp_domain: novalocal
       logging:
       - engine: syslog
         facility: local0
diff --git a/metadata/service/control/single.yml b/metadata/service/control/single.yml
index e6cbe11..a9c83b3 100644
--- a/metadata/service/control/single.yml
+++ b/metadata/service/control/single.yml
@@ -11,6 +11,7 @@
       version: ${_param:nova_version}
       security_group: false
       vncproxy_url: ${_param:nova_vncproxy_url}
+      dhcp_domain: novalocal
       logging:
       - engine: syslog
         facility: local0
diff --git a/nova/files/juno/nova-controller.conf.Debian b/nova/files/juno/nova-controller.conf.Debian
index d32b380..d861cfc 100644
--- a/nova/files/juno/nova-controller.conf.Debian
+++ b/nova/files/juno/nova-controller.conf.Debian
@@ -12,6 +12,7 @@
 volumes_dir = /etc/nova/volumes
 dhcpbridge = /usr/bin/nova-dhcpbridge
 dhcpbridge_flagfile = /etc/nova/nova.conf
+dhcp_domain = {{ controller.dhcp_domain }}
 force_dhcp_release = True
 injected_network_template = /usr/share/nova/interfaces.template
 libvirt_nonblocking = True
@@ -149,4 +150,4 @@
 db_retry_interval = 1
 connection_debug = 10
 pool_timeout = 120
-connection = {{ controller.database.engine }}://{{ controller.database.user }}:{{ controller.database.password }}@{{ controller.database.host }}/{{ controller.database.name }}
\ No newline at end of file
+connection = {{ controller.database.engine }}://{{ controller.database.user }}:{{ controller.database.password }}@{{ controller.database.host }}/{{ controller.database.name }}
diff --git a/nova/files/kilo/nova-controller.conf.Debian b/nova/files/kilo/nova-controller.conf.Debian
index 309b4ab..1a2f316 100644
--- a/nova/files/kilo/nova-controller.conf.Debian
+++ b/nova/files/kilo/nova-controller.conf.Debian
@@ -12,6 +12,7 @@
 volumes_dir = /etc/nova/volumes
 dhcpbridge = /usr/bin/nova-dhcpbridge
 dhcpbridge_flagfile = /etc/nova/nova.conf
+dhcp_domain = {{ controller.dhcp_domain }}
 force_dhcp_release = True
 injected_network_template = /usr/share/nova/interfaces.template
 libvirt_nonblocking = True
@@ -169,4 +170,4 @@
 service_metadata_proxy=True
 
 [cinder]
-os_region_name = RegionOne
\ No newline at end of file
+os_region_name = RegionOne