add --playbook2 option

Sponsored-by: author

1 files changed, 9 insertions, 7 deletions

diff --git a/v-i b/v-i
index 4d5f9be..c1957fa 100755
--- a/v-i
+++ b/v-i
@@ -119,7 +119,7 @@ def clean_up_disks(device):
     run(["blkdiscard", "--force", device], check=True, capture_output=True)
 
 
-def vmdb_spec(cryptsetup_password, playbook, extra_vars):
+def vmdb_spec(cryptsetup_password, playbook, playbook2, extra_vars):
     device = "{{ image }}"
     spec = {
         "steps": [
@@ -271,11 +271,12 @@ def vmdb_spec(cryptsetup_password, playbook, extra_vars):
         ]
     )
 
-    # If a playbook has been specified, add an ansible step.
-    if playbook:
-        spec["steps"].append(
-            {"ansible": "root", "playbook": playbook, "extra_vars": extra_vars}
-        )
+    # If playbooks have been specified, add ansible steps.
+    for p in (playbook, playbook2):
+        if p:
+            spec["steps"].append(
+                {"ansible": "root", "playbook": p, "extra_vars": extra_vars}
+            )
 
     return spec
 
@@ -286,6 +287,7 @@ def main():
     p.add_argument("--log", default="install.log")
     p.add_argument("--cache", default="cache.tar.gz")
     p.add_argument("--playbook", default="std.yml")
+    p.add_argument("--playbook2")
     p.add_argument("--vars")
     p.add_argument("--luks")
     p.add_argument("device")
@@ -302,7 +304,7 @@ def main():
 
     clean_up_disks(args.device)
 
-    spec = vmdb_spec(args.luks, args.playbook, extra_vars)
+    spec = vmdb_spec(args.luks, args.playbook, args.playbook2, extra_vars)
     tmp = tempfile.mkdtemp()
     specfile = os.path.join(tmp, "spec.yaml")
     if args.verbose: