starlingx/config
Code Issues Proposed changes

Merge "Revert "Reduce manifests running after upgrade completes""

Browse Source
This commit is contained in:
Zuul 2025-01-25 20:38:24 +00:00 committed by Gerrit Code Review
commit 4ef6fc25ff
2 changed files with 6 additions and 18 deletions
controllerconfig/controllerconfig/upgrade-scripts
102-create-required-platform-certs.py
sysinv/sysinv/sysinv/sysinv/puppet
openstack.py

11
controllerconfig/controllerconfig/upgrade-scripts/102-create-required-platform-certs.py

@ -50,7 +50,6 @@ AUTO_CREATED_TAG = '.auto_created_cert-'
K8S_RESOURCES_TMP_FILENAME = '/tmp/update_cert.yml'
TRUSTED_BUNDLE_FILEPATH = '/etc/ssl/certs/ca-cert.pem'
CONFIG_FOLDER = '/opt/platform/config/'
HTTPS_CONFIG_FLAG = '.https_config_required'
OPENLDAP_CERT_NAME = 'system-openldap-local-certificate'
HTTPS_CERT_NAME = 'system-restapi-gui-certificate'
@ -430,15 +429,6 @@ def check_cert_auto_creation_file_flag(cert_name, version):
return os.path.isfile(get_cert_auto_creation_filename(cert_name, version))
def remove_https_config_flag(version):
try:
file = os.path.join(CONFIG_FOLDER, version, HTTPS_CONFIG_FLAG)
os.remove(file)
LOG.warning("Removing config flag: %s" % file)
except OSError:
pass
def remove_cert_auto_creation_file_flag(cert_name, version):
try:
os.remove(get_cert_auto_creation_filename(cert_name, version))
@ -620,7 +610,6 @@ def main():
adapt_legacy_certificate_config(to_release)
reconfigure_certificates_subject()
create_platform_certificates(to_release)
remove_https_config_flag(to_release)
patch_https_enabled(True)
create_platform_certificates_updated_file_flag()
LOG.info("Successfully created/updated required platform "

13
sysinv/sysinv/sysinv/sysinv/puppet/openstack.py

@ -118,13 +118,12 @@ class OpenstackBasePuppet(base.BasePuppet):
(is_upgrading and
os.path.isfile(constants.OLD_ANSIBLE_BOOTSTRAP_COMPLETED_FLAG))
dc_role = self._distributed_cloud_role()
is_dc = (dc_role == constants.DISTRIBUTED_CLOUD_ROLE_SYSTEMCONTROLLER or
dc_role == constants.DISTRIBUTED_CLOUD_ROLE_SUBCLOUD)
if bootstrap_completed and is_dc:
if (os.path.isfile(constants.RESTORE_IN_PROGRESS_FLAG) or
is_upgrading):
if bootstrap_completed and \
(self._distributed_cloud_role() ==
constants.DISTRIBUTED_CLOUD_ROLE_SYSTEMCONTROLLER or
self._distributed_cloud_role() ==
constants.DISTRIBUTED_CLOUD_ROLE_SUBCLOUD):
if os.path.isfile(constants.RESTORE_IN_PROGRESS_FLAG):
if os.path.isfile(constants.ADMIN_ENDPOINT_CONFIG_REQUIRED):
os.remove(constants.ADMIN_ENDPOINT_CONFIG_REQUIRED)
else: