From f639a33a9c8deebfcc3570f1817c1d0e5766c7af Mon Sep 17 00:00:00 2001 From: Salman Rana Date: Fri, 26 Jul 2024 17:51:58 -0400 Subject: [PATCH] Support enroll-init retry In the event of an enroll-init failure (e.g., standalone node reconfig failure), a retry without reinstallation must be supported to allow users to simply try again with updated config values. Overall, this requires the cloud-init services to remain enabled, such that cloud config can be re-applied and enroll-init scripts can re-run. Story: 2011100 Task: 50662 Test Plan: 1. PASS: Validate cloud-init services: - Verify cloud-init remains enabled until enroll reconfig succeeds - Verify cloud-init services are fully disabled after a successful enroll reconfig 2. PASS: Ensure enroll-init-reconfig script can be triggered via cloud-init multiple times until success 3. PASS: Validate that enroll-init can be redone after successive failures: - Initiate enroll-init with bad parametere such that the enroll-init-reconfig script fails - Verify enroll-init success with corrected parameters - Verify error/success msgs on for each enroll-init attempt Change-Id: I87f32b89255d84af381642cf7f9920169cb6b5d1 Signed-off-by: Salman Rana --- utilities/platform-util/scripts/enroll-init-cleanup | 10 ++++++---- .../platform-util/scripts/enroll-init-reconfigure | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/utilities/platform-util/scripts/enroll-init-cleanup b/utilities/platform-util/scripts/enroll-init-cleanup index 99625fb3..800dd5da 100644 --- a/utilities/platform-util/scripts/enroll-init-cleanup +++ b/utilities/platform-util/scripts/enroll-init-cleanup @@ -7,8 +7,10 @@ # script to cleanup the cloud-init services # -touch /etc/cloud/cloud-init.disabled -rm -f /etc/systemd/system-preset/20-cloud-init.preset +if [ -f "/var/lib/factory-install/state/enroll-init" ]; then + touch /etc/cloud/cloud-init.disabled + rm -f /etc/systemd/system-preset/20-cloud-init.preset -systemctl daemon-reload -systemctl preset-all + systemctl daemon-reload + systemctl preset-all +fi diff --git a/utilities/platform-util/scripts/enroll-init-reconfigure b/utilities/platform-util/scripts/enroll-init-reconfigure index 632fc803..6223a3d4 100755 --- a/utilities/platform-util/scripts/enroll-init-reconfigure +++ b/utilities/platform-util/scripts/enroll-init-reconfigure @@ -246,4 +246,6 @@ check_services_status reconfigure_OAM reconfigure_password +touch /var/lib/factory-install/state/enroll-init + log_info "Successfully reconfigured OAM network and system password."