diff --git a/examples/allinone.yaml b/examples/allinone.yaml
index 9506307e..93d193c9 100644
--- a/examples/allinone.yaml
+++ b/examples/allinone.yaml
@@ -142,6 +142,10 @@ openstack::neutron::shared_secret: 'by-sa-bo'
 openstack::neutron::core_plugin: 'ml2'
 openstack::neutron::service_plugins: ['router', 'firewall', 'lbaas', 'vpnaas', 'metering']
 
+openstack::neutron::config_endpoint: true
+openstack::neutron::config_user: true
+openstack::neutron::config_user_role: true
+
 ######## Ceilometer
 openstack::ceilometer::address::management: '172.16.33.4'
 openstack::ceilometer::mongo::username: 'mongo'
diff --git a/examples/common.yaml b/examples/common.yaml
index d7c6d50e..768adb0e 100644
--- a/examples/common.yaml
+++ b/examples/common.yaml
@@ -142,6 +142,10 @@ openstack::neutron::shared_secret: 'by-sa-bo'
 openstack::neutron::core_plugin: 'ml2'
 openstack::neutron::service_plugins: ['router', 'firewall', 'lbaas', 'vpnaas', 'metering']
 
+openstack::neutron::config_endpoint: true
+openstack::neutron::config_user: true
+openstack::neutron::config_user_role: true
+
 ######## Ceilometer
 openstack::ceilometer::address::management: '172.16.33.4'
 openstack::ceilometer::mongo::username: 'mongo'
diff --git a/manifests/common/neutron.pp b/manifests/common/neutron.pp
index d0d90ed6..6f619472 100644
--- a/manifests/common/neutron.pp
+++ b/manifests/common/neutron.pp
@@ -32,11 +32,14 @@
   }
 
   class { '::neutron::keystone::auth':
-    password         => $::openstack::config::neutron_password,
-    public_address   => $::openstack::config::controller_address_api,
-    admin_address    => $::openstack::config::controller_address_management,
-    internal_address => $::openstack::config::controller_address_management,
-    region           => $::openstack::config::region,
+    configure_endpoint  => $::openstack::config::neutron_config_endpoint,
+    configure_user      => $::openstack::config::neutron_config_user,
+    configure_user_role => $::openstack::config::neutron_config_user_role,
+    password            => $::openstack::config::neutron_password,
+    public_address      => $::openstack::config::controller_address_api,
+    admin_address       => $::openstack::config::controller_address_management,
+    internal_address    => $::openstack::config::controller_address_management,
+    region              => $::openstack::config::region,
   }
 
   class { '::neutron::server':
diff --git a/manifests/config.pp b/manifests/config.pp
index ea7ac5d3..8e31df08 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -68,6 +68,9 @@
   $neutron_type_drivers = undef,
   $neutron_mechanism_drivers = undef,
   $neutron_tunnel_id_ranges = undef,
+  $neutron_config_endpoint = undef,
+  $neutron_config_user = undef,
+  $neutron_config_user_role = undef,
   $plumgrid_director_vip = undef,
   $plumgrid_username = undef,
   $plumgrid_password = undef,
diff --git a/manifests/init.pp b/manifests/init.pp
index 288fe23c..f118f31b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -276,6 +276,18 @@
 #   Neutron tunnel id ranges.
 #   Defaults to ['1:1000']
 #
+# [*neutron_config_keystone_endpoint*]
+#   Boolean. Whether to config keystone endpoint for Neutron.
+#   Default to true
+# 
+# [*neutron_config_keystone_user*]
+#   Boolean. Whether to config keystone user for Neutron.
+#   Default to true
+#
+# [*neutron_config_keystone_user_role*]
+#   Boolean. Whether to config keystone user role for Neutron.
+#   Default to true
+#
 # == Ceilometer
 # [*ceilometer_address_management*]
 #   The management IP address of the ceilometer node. Must be in the network_management CIDR.
@@ -434,6 +446,9 @@
   $neutron_type_drivers = ['gre'],
   $neutron_mechanism_drivers = ['openvswitch'],
   $neutron_tunnel_id_ranges = ['1:1000'],
+  $neutron_config_endpoint = true,
+  $neutron_config_user = true,
+  $neutron_config_user_role = true,
   $ceilometer_address_management = undef,
   $ceilometer_mongo_username = undef,
   $ceilometer_mongo_password = undef,
@@ -523,6 +538,9 @@
       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_config_endpoint       => hiera(openstack::neutron::config_endpoint),
+      neutron_config_user           => hiera(openstack::neutron::config_user),
+      neutron_config_user_role      => hiera(openstack::neutron::config_user_role),
       ceilometer_address_management => hiera(openstack::ceilometer::address::management),
       ceilometer_mongo_username     => hiera(openstack::ceilometer::mongo::username),
       ceilometer_mongo_password     => hiera(openstack::ceilometer::mongo::password),
@@ -617,6 +635,9 @@
       neutron_type_drivers          => $neutron_type_drivers,
       neutron_mechanism_drivers     => $neutron_mechanism_drivers,
       neutron_tunnel_id_ranges      => $neutron_tunnel_id_ranges,
+      neutron_config_endpoint       => $neutron_config_endpoint,
+      neutron_config_user           => $neutron_config_user,
+      neutron_config_user_role      => $neutron_config_user_role,
       ceilometer_address_management => $ceilometer_address_management,
       ceilometer_mongo_username     => $ceilometer_mongo_username,
       ceilometer_mongo_password     => $ceilometer_mongo_password,