diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index b39761ca..b76309ac 100644
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -195,8 +195,10 @@ class trove::keystone::auth (
 
   $real_service_name = pick($service_name, $auth_name)
 
-  Keystone_user_role["${auth_name}@${tenant}"]        ~> Service <| name == 'trove-server' |>
-  Keystone_endpoint["${region}/${real_service_name}"] ~> Service <| name == 'trove-server' |>
+  Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'trove-server' |>
+
+  Keystone_endpoint<| title == "${region}/${real_service_name}" |>
+        ~> Service <| name == 'trove-server' |>
 
   keystone::resource::service_identity { 'trove':
     configure_user      => true,
diff --git a/spec/classes/trove_keystone_auth_spec.rb b/spec/classes/trove_keystone_auth_spec.rb
index 63204e9d..dde648f4 100644
--- a/spec/classes/trove_keystone_auth_spec.rb
+++ b/spec/classes/trove_keystone_auth_spec.rb
@@ -130,4 +130,12 @@ describe 'trove::keystone::auth' do
     it { is_expected.to contain_keystone_endpoint('RegionOne/trove_service') }
   end
 
+  describe 'when disabling endpoint configuration' do
+    let :params do
+      { :configure_endpoint => false,
+        :password           => 'trove_password' }
+    end
+
+    it { is_expected.to_not contain_keystone_endpoint('RegionOne/neutron') }
+  end
 end