PR review updates. Improved messages and modification of startup scri…

…pts.
GoogleCloudPlatform · Oct 6, 2023 · 7bba5e9 · 7bba5e9
1 parent 7229902
commit 7bba5e9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/modules/scripts/startup-script/files/running-script-warning.sh b/modules/scripts/startup-script/files/running-script-warning.sh
@@ -15,12 +15,12 @@
 
 WARNING=$(
 	cat <<EOF
-** NOTICE **: Do not use this machine while the startup scripts are running. 
-Use the following command to check that the service is "inactive" before using
-the system.
-
-'systemctl status google-startup-scripts.service' 
+** NOTICE **: System services may not be running until startup scripts complete.
+The output of the command below will end with "Finished Google Compute Engine 
+Startup Scripts." when they are complete. Please review the output for any 
+errors which may indicate that services are unhealthy. 
 
+sudo journalctl -b 0 -u google-startup-scripts.service
 EOF
 )
 

diff --git a/modules/scripts/startup-script/files/startup-script-stdlib-head.sh b/modules/scripts/startup-script/files/startup-script-stdlib-head.sh
@@ -33,20 +33,21 @@ readonly E_UNKNOWN_ARG=10
 SUCCESS_MESSAGE=$(
 	cat <<-EOF
 		** NOTICE **: The VM startup scripts have finished running successfully.  
-		It is now safe to start using the system.
+		Systems are configured and running.
 	EOF
 )
 readonly SUCCESS_MESSAGE
 ERROR_MESSAGE=$(
 	cat <<-EOF
 		** ERROR **: The VM startup scripts have finished running, but produced an error.
+		Systems may be in an unhealthy state.
 	EOF
 )
 readonly ERROR_MESSAGE
 WARNING_MESSAGE=$(
 	cat <<-EOF
-		** WARNING **: The VM startup scripts for this machine have not been completed 
-		and system services may not be configured yet.
+		** WARNING **: The VM startup scripts for this machine have started.
+		Systems may not be configured or running.
 	EOF
 )
 readonly WARNING_MESSAGE

diff --git a/modules/scripts/startup-script/main.tf b/modules/scripts/startup-script/main.tf
@@ -30,7 +30,7 @@ locals {
     {
       type        = "data"
       content     = file("${path.module}/files/running-script-warning.sh")
-      destination = "/etc/profile.d/20-running-script-warning.sh"
+      destination = "/etc/profile.d/99-running-script-warning.sh"
     }
   ]