diff --git a/puppet-manifests/src/modules/openstack/manifests/keystone.pp b/puppet-manifests/src/modules/openstack/manifests/keystone.pp
index 6aff8e233..8297ca4cd 100644
--- a/puppet-manifests/src/modules/openstack/manifests/keystone.pp
+++ b/puppet-manifests/src/modules/openstack/manifests/keystone.pp
@@ -299,7 +299,7 @@ class openstack::keystone::server::runtime {
 
 class openstack::keystone::endpoint::runtime {
 
-  if str2bool($::is_controller_active) {
+  if str2bool($::is_controller_active) and !find_file('/var/run/.enrollment_in_progress') {
     case $::osfamily {
         'RedHat': {
             include ::keystone::endpoint