--- b/neutron/manifests/agents/dhcp.pp
+++ a/neutron/manifests/agents/dhcp.pp
@@ -31,6 +31,2 @@
 #
-# [*dhcp_domain*]
-#   (optional) domain to use for building the hostnames
-#   Defaults to 'openstacklocal'
-#
 # [*dhcp_driver*]
@@ -75,3 +71,2 @@
   $interface_driver       = 'neutron.agent.linux.interface.OVSInterfaceDriver',
-  $dhcp_domain            = 'openstacklocal',
   $dhcp_driver            = 'neutron.agent.linux.dhcp.Dnsmasq',
@@ -120,3 +115,2 @@
     'DEFAULT/interface_driver':       value => $interface_driver;
-    'DEFAULT/dhcp_domain':            value => $dhcp_domain;
     'DEFAULT/dhcp_driver':            value => $dhcp_driver;
--- b/neutron/spec/classes/neutron_agents_dhcp_spec.rb
+++ a/neutron/spec/classes/neutron_agents_dhcp_spec.rb
@@ -19,3 +19,2 @@
       :interface_driver       => 'neutron.agent.linux.interface.OVSInterfaceDriver',
-      :dhcp_domain            => 'openstacklocal',
       :dhcp_driver            => 'neutron.agent.linux.dhcp.Dnsmasq',
@@ -44,3 +43,2 @@
       is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/interface_driver').with_value(p[:interface_driver]);
-      is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/dhcp_domain').with_value(p[:dhcp_domain]);
       is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/dhcp_driver').with_value(p[:dhcp_driver]);
--- a/manifests/agents/dhcp.pp
+++ b/manifests/agents/dhcp.pp
@@ -31,2 +31,6 @@
 #
+# [*dhcp_domain*]
+#   (optional) domain to use for building the hostnames
+#   Defaults to 'openstacklocal'
+#
 # [*dhcp_driver*]
@@ -71,2 +75,3 @@
   $interface_driver       = 'neutron.agent.linux.interface.OVSInterfaceDriver',
+  $dhcp_domain            = 'openstacklocal',
   $dhcp_driver            = 'neutron.agent.linux.dhcp.Dnsmasq',
@@ -115,2 +120,3 @@
     'DEFAULT/interface_driver':       value => $interface_driver;
+    'DEFAULT/dhcp_domain':            value => $dhcp_domain;
     'DEFAULT/dhcp_driver':            value => $dhcp_driver;
--- a/spec/classes/neutron_agents_dhcp_spec.rb
+++ b/spec/classes/neutron_agents_dhcp_spec.rb
@@ -19,2 +19,3 @@
       :interface_driver       => 'neutron.agent.linux.interface.OVSInterfaceDriver',
+      :dhcp_domain            => 'openstacklocal',
       :dhcp_driver            => 'neutron.agent.linux.dhcp.Dnsmasq',
@@ -43,2 +44,3 @@
       is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/interface_driver').with_value(p[:interface_driver]);
+      is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/dhcp_domain').with_value(p[:dhcp_domain]);
       is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/dhcp_driver').with_value(p[:dhcp_driver]);