From 343d66875b7cd2418eb5a0d71f2b53feafd90240 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Wed, 16 Nov 2022 12:42:28 -0500 Subject: [PATCH] Skip swap volumes during mounting --- api-daemon/provisioner/examples/script/3-debootstrap.py | 2 +- api-daemon/provisioner/examples/script/4-rinse.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api-daemon/provisioner/examples/script/3-debootstrap.py b/api-daemon/provisioner/examples/script/3-debootstrap.py index dae3087b..6d2fab93 100644 --- a/api-daemon/provisioner/examples/script/3-debootstrap.py +++ b/api-daemon/provisioner/examples/script/3-debootstrap.py @@ -398,7 +398,7 @@ class VMBuilderScript(VMBuilder): if volume.get("source_volume") is not None: continue - if volume.get("filesystem") is None: + if volume.get("filesystem") is None or volume.get("filesystem") == "swap": continue mapped_dst_volume = f"/dev/rbd/{dst_volume}" diff --git a/api-daemon/provisioner/examples/script/4-rinse.py b/api-daemon/provisioner/examples/script/4-rinse.py index 87a9a87f..de09e2e8 100644 --- a/api-daemon/provisioner/examples/script/4-rinse.py +++ b/api-daemon/provisioner/examples/script/4-rinse.py @@ -398,7 +398,7 @@ class VMBuilderScript(VMBuilder): if volume.get("source_volume") is not None: continue - if volume.get("filesystem") is None: + if volume.get("filesystem") is None or volume.get("filesystem") == "swap": continue mapped_dst_volume = f"/dev/rbd/{dst_volume}"