diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index 89d2c5d8..3520f367 100644
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -114,8 +114,9 @@ class ironic::keystone::auth (
   if $configure_user_role {
     Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'ironic-server' |>
   }
-
-  Keystone_endpoint["${region}/${service_name}::${service_type}"]  ~> Service <| name == 'ironic-server' |>
+  if $configure_endpoint {
+    Keystone_endpoint["${region}/${service_name}::${service_type}"]  ~> Service <| name == 'ironic-server' |>
+  }
 
   keystone::resource::service_identity { 'ironic':
     configure_user      => $configure_user,
diff --git a/manifests/keystone/auth_inspector.pp b/manifests/keystone/auth_inspector.pp
index 3be07981..6a1006ac 100644
--- a/manifests/keystone/auth_inspector.pp
+++ b/manifests/keystone/auth_inspector.pp
@@ -102,8 +102,9 @@ class ironic::keystone::auth_inspector (
   if $configure_user_role {
     Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'ironic-inspector' |>
   }
-
-  Keystone_endpoint["${region}/${real_service_name}::${service_type}"]  ~> Service <| name == 'ironic-inspector' |>
+  if $configure_endpoint {
+    Keystone_endpoint["${region}/${real_service_name}::${service_type}"]  ~> Service <| name == 'ironic-inspector' |>
+  }
 
   keystone::resource::service_identity { $auth_name:
     configure_user      => $configure_user,