From cfd09033c8857e999d3e95b484877f2774f32c75 Mon Sep 17 00:00:00 2001 From: Salman Rana Date: Thu, 19 Dec 2024 11:07:11 -0500 Subject: [PATCH] Block keystone::endpoint::runtime during subcloud enrollment This commit checks the /var/run/.enrollment_in_progress flag to prevent the openstack::keystone::endpoint::runtime class from running during subcloud enrollment. For more details, see the related Ansible changes [1]. [1] https://review.opendev.org/c/starlingx/ansible-playbooks/+/938058 Test Plan: This commit was tested alongside the related changes [1]. Partial-bug: 2092214 Change-Id: I1cdd75001f2221a4e02ebac52494f91c7a40fa52 Signed-off-by: Salman Rana --- puppet-manifests/src/modules/openstack/manifests/keystone.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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