Merge branch 'main' into support/3.2

zatosource · Sep 7, 2024 · d3088bc · d3088bc
2 parents 5a44f4f + fd51103
commit d3088bc
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/code/zato-cli/src/zato/cli/quickstart.py b/code/zato-cli/src/zato/cli/quickstart.py
@@ -98,7 +98,7 @@
 # ################################################################################################################################
 
 start_servers_template = """
-$ZATO_BIN start $BASE_DIR/{server_name} --verbose
+$ZATO_BIN start $BASE_DIR/{server_name} --verbose --env-file /opt/hot-deploy/enmasse/env.ini
 $ZATO_BIN wait --path $BASE_DIR/{server_name}
 echo [{step_number}/$STEPS] {server_name} started
 """
@@ -111,6 +111,8 @@
 set -e
 export ZATO_CLI_DONT_SHOW_OUTPUT=1
 
+{preamble_script}
+
 {script_dir}
 ZATO_BIN={zato_bin}
 STEPS={start_steps}
@@ -318,6 +320,7 @@ class Create(ZatoCommand):
     opts.append({'name':'--jwt-secret-key', 'help':'Secret key for JWT (JSON Web Tokens)'})
     opts.append({'name':'--no-scheduler', 'help':'Create all the components but not a scheduler', 'action':'store_true'})
     opts.append({'name':'--scheduler-only', 'help':'Only create a scheduler, without other components', 'action':'store_true'})
+    opts.append({'name':'--preamble-script', 'help':'Extra script to add to startup scripts'})
 
     opts += deepcopy(common_scheduler_server_address_opts)
     opts += deepcopy(common_scheduler_server_api_client_opts)
@@ -426,6 +429,9 @@ def execute(self, args:'any_') -> 'None':
 
         random.seed()
 
+        # Possibly used by startup scripts
+        preamble_script = self.get_arg('preamble_script')
+
         # We handle both ..
         admin_invoke_password = self.get_arg('admin_invoke_password')
         server_api_client_for_scheduler_password = self.get_arg('server_api_client_for_scheduler_password')
@@ -781,6 +787,7 @@ def execute(self, args:'any_') -> 'None':
             web_admin_step_count -= 1
 
         zato_qs_start_head = zato_qs_start_head_template.format(
+            preamble_script=preamble_script,
             zato_bin=zato_bin,
             script_dir=script_dir,
             cluster_name=cluster_name,