Fix call of mariadb backup role (#767)

Signed-off-by: Christian Berendt <[email protected]>
osism · Jan 17, 2024 · d37bd82 · d37bd82
1 parent 76e5064
commit d37bd82
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 19 deletions.
diff --git a/osism/core/enums.py b/osism/core/enums.py
@@ -108,6 +108,8 @@
     "refstack": {"environment": "openstack", "runtime": "osism-ansible"},
     "system-encoding": {"environment": "generic", "runtime": "osism-ansible"},
     "ulimits": {"environment": "generic", "runtime": "osism-ansible"},
+    "mariadb-backup": {"environment": "kolla", "runtime": "kolla-ansible"},
+    "mariadb-recovery": {"environment": "kolla", "runtime": "kolla-ansible"},
 }
 
 MAP_ROLE2ROLE = {

diff --git a/osism/tasks/__init__.py b/osism/tasks/__init__.py
@@ -2,6 +2,7 @@
 
 import os
 from pathlib import Path
+import re
 import subprocess
 import time
 
@@ -108,26 +109,28 @@ def run_ansible_in_environment(
         if locking:
             lock.acquire()
 
-        if role == "mariadb_backup":
-            command = f"/run.sh backup {role} {joined_arguments}"
-            logger.info(f"RUN {command}")
-            p = subprocess.Popen(
-                command,
-                stdout=subprocess.PIPE,
-                stderr=subprocess.STDOUT,
-                shell=True,
-                env=env,
-            )
+        if role in ["mariadb-backup", "mariadb_backup"]:
+            action = "backup"
+            role = "mariadb"
+            # Hacky workaround. The handling of kolla_action will be revised in the future.
+            joined_arguments = re.sub(joined_arguments, "", "-e kolla_action=deploy")
+        elif role in ["mariadb-recovery", "mariadb_recovery"]:
+            action = "recovery"
+            role = "mariadb"
+            # Hacky workaround. The handling of kolla_action will be revised in the future.
+            joined_arguments = re.sub(joined_arguments, "", "-e kolla_action=deploy")
         else:
-            command = f"/run.sh deploy {role} {joined_arguments}"
-            logger.info(f"RUN {command}")
-            p = subprocess.Popen(
-                command,
-                stdout=subprocess.PIPE,
-                stderr=subprocess.STDOUT,
-                shell=True,
-                env=env,
-            )
+            action = "deploy"
+
+        command = f"/run.sh {action} {role} {joined_arguments}"
+        logger.info(f"RUN {command}")
+        p = subprocess.Popen(
+            command,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+            shell=True,
+            env=env,
+        )
 
     # execute roles from ceph-ansible
     elif worker == "ceph-ansible":