diff --git a/manifests/common/neutron.pp b/manifests/common/neutron.pp
index d0d90ed6..d3f89de8 100644
--- a/manifests/common/neutron.pp
+++ b/manifests/common/neutron.pp
@@ -45,6 +45,7 @@
     database_connection => $database_connection,
     enabled             => $is_controller,
     sync_db             => $is_controller,
+    router_distributed  => $::openstack::config::neutron_router_distributed,
     mysql_module        => '2.2',
   }
 
diff --git a/manifests/config.pp b/manifests/config.pp
index ea7ac5d3..881ed484 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -66,6 +66,8 @@
   $neutron_tunnel_types = undef,
   $neutron_tenant_network_type = undef,
   $neutron_type_drivers = undef,
+  $neutron_agent_mode = undef,
+  $neutron_router_distributed = undef,
   $neutron_mechanism_drivers = undef,
   $neutron_tunnel_id_ranges = undef,
   $plumgrid_director_vip = undef,
diff --git a/manifests/init.pp b/manifests/init.pp
index 288fe23c..50ac8ed7 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -434,6 +434,8 @@
   $neutron_type_drivers = ['gre'],
   $neutron_mechanism_drivers = ['openvswitch'],
   $neutron_tunnel_id_ranges = ['1:1000'],
+  $neutron_agent_mode = ['legacy'],
+  $neutron_router_distributed = false,
   $ceilometer_address_management = undef,
   $ceilometer_mongo_username = undef,
   $ceilometer_mongo_password = undef,
@@ -523,6 +525,8 @@
       neutron_type_drivers          => hiera(openstack::neutron::neutron_type_drivers, $neutron_type_drivers),
       neutron_mechanism_drivers     => hiera(openstack::neutron::neutron_mechanism_drivers, $neutron_mechanism_drivers),
       neutron_tunnel_id_ranges      => hiera(openstack::neutron::neutron_tunnel_id_ranges, $neutron_tunnel_id_ranges),
+      neutron_agent_mode            => hiera(openstack::neutron::agent_mode, $neutron_agent_mode),
+      neutron_router_distributed    => hiera(openstack::neutron::router_distributed, $neutron_router_distributed),
       ceilometer_address_management => hiera(openstack::ceilometer::address::management),
       ceilometer_mongo_username     => hiera(openstack::ceilometer::mongo::username),
       ceilometer_mongo_password     => hiera(openstack::ceilometer::mongo::password),
diff --git a/manifests/profile/neutron/router.pp b/manifests/profile/neutron/router.pp
index 80579f54..95503a81 100644
--- a/manifests/profile/neutron/router.pp
+++ b/manifests/profile/neutron/router.pp
@@ -15,6 +15,7 @@
     debug                   => $::openstack::config::debug,
     external_network_bridge => 'brex',
     enabled                 => true,
+    agent_mode              => $::openstack::config::neutron_agent_mode,
   }
 
   class { '::neutron::agents::dhcp':