Refactor configure-module action to include restore functionality

NethServer · Apr 26, 2024 · 8063865 · 8063865
1 parent 6760482
commit 8063865
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/imageroot/actions/clone-module/50configure-module b/imageroot/actions/clone-module/50configure-module
@@ -13,5 +13,6 @@ configure_retval = agent.tasks.run(agent_id=os.environ['AGENT_ID'], action='conf
     "lets_encrypt": os.environ["TRAEFIK_LETS_ENCRYPT"] == 'True',
     "host": os.environ["TRAEFIK_HOST"],
     "http2https": os.environ["TRAEFIK_HTTP2HTTPS"] == 'True',
+    "restore": True,
 })
 agent.assert_exp(configure_retval['exit_code'] == 0, "The configure-module subtask failed!")
diff --git a/imageroot/actions/configure-module/02_validate_bcc_server b/imageroot/actions/configure-module/02_validate_bcc_server
@@ -15,7 +15,10 @@ agent.set_weight(os.path.basename(__file__), 0) # Validation step, no task progr
 # Try to parse the stdin as JSON.
 # If parsing fails, output everything to stderr
 data = json.load(sys.stdin)
-
+# we are restoring, do not test
+if data.get('restore', False):
+    sys.exit(0)
+
 # Connect to redis
 rdb = agent.redis_connect()
 

diff --git a/imageroot/actions/restore-module/50configure-module b/imageroot/actions/restore-module/50configure-module
@@ -18,5 +18,6 @@ configure_retval = agent.tasks.run(agent_id=os.environ['AGENT_ID'], action='conf
     "lets_encrypt": renv["TRAEFIK_LETS_ENCRYPT"] == 'True',
     "host": renv["TRAEFIK_HOST"],
     "http2https": renv["TRAEFIK_HTTP2HTTPS"] == 'True',
+    "restore": True,
 })
 agent.assert_exp(configure_retval['exit_code'] == 0, "The configure-module subtask failed!")