Merge pull request #25 from VallariAg/custom-conf

Add TEUTHOLOGY_CONF and TEUTHOLOGY_YAML to teuthology container

Author: zmc

ceph_devstack/resources/ceph/containers.py

@@ -341,6 +341,20 @@ def create_cmd(self):
                 "-e",
                 f"SSH_AUTH_SOCK={ssh_auth_socket}",
             ]
+        custom_conf = os.environ.get("TEUTHOLOGY_CONF")
+        if custom_conf:
+            cmd += [
+                "-v",
+                f"{custom_conf}:/tmp/conf.yaml",
+                "-e",
+                f"TEUTHOLOGY_CONF=/tmp/conf.yaml",
+            ]
+        teuthology_yaml = os.environ.get("TEUTHOLOGY_YAML")
+        if teuthology_yaml:
+            cmd += [
+                "-v",
+                f"{teuthology_yaml}:/root/.teuthology.yaml",
+            ]
         cmd += [
             "--name",
             "{name}",