From f01c12c86b02db1aa9374cb760477a31b9c5cb17 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Sat, 9 Dec 2023 12:22:19 -0500 Subject: [PATCH] Import from pvcworkerd not pvcapid --- api-daemon/provisioner/examples/script/2-ova.py | 4 ++-- api-daemon/provisioner/examples/script/3-debootstrap.py | 6 +++--- api-daemon/provisioner/examples/script/4-rinse.py | 6 +++--- api-daemon/provisioner/examples/script/5-pfsense.py | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/api-daemon/provisioner/examples/script/2-ova.py b/api-daemon/provisioner/examples/script/2-ova.py index 168dc6b4..05b15e7d 100644 --- a/api-daemon/provisioner/examples/script/2-ova.py +++ b/api-daemon/provisioner/examples/script/2-ova.py @@ -290,7 +290,7 @@ class VMBuilderScript(VMBuilder): # Run any imports first from daemon_lib.vmbuilder import open_zk - from pvcapid.Daemon import config + from pvcworkerd.Daemon import config import daemon_lib.common as pvc_common import daemon_lib.ceph as pvc_ceph import os @@ -384,7 +384,7 @@ class VMBuilderScript(VMBuilder): # Run any imports first from daemon_lib.vmbuilder import open_zk - from pvcapid.Daemon import config + from pvcworkerd.Daemon import config import daemon_lib.ceph as pvc_ceph for volume in list(reversed(self.vm_data["volumes"])): diff --git a/api-daemon/provisioner/examples/script/3-debootstrap.py b/api-daemon/provisioner/examples/script/3-debootstrap.py index 94080691..24fdd97e 100644 --- a/api-daemon/provisioner/examples/script/3-debootstrap.py +++ b/api-daemon/provisioner/examples/script/3-debootstrap.py @@ -303,14 +303,14 @@ class VMBuilderScript(VMBuilder): open_zk is exposed from daemon_lib.vmbuilder to provide a context manager for opening connections to the PVC Zookeeper cluster; ensure you also import (and pass it) - the config object from pvcapid.Daemon as well. This context manager then allows + the config object from pvcworkerd.Daemon as well. This context manager then allows the use of various common daemon library functions, without going through the API. """ # Run any imports first import os from daemon_lib.vmbuilder import open_zk - from pvcapid.Daemon import config + from pvcworkerd.Daemon import config import daemon_lib.common as pvc_common import daemon_lib.ceph as pvc_ceph @@ -719,7 +719,7 @@ GRUB_DISABLE_LINUX_UUID=false # Run any imports first import os from daemon_lib.vmbuilder import open_zk - from pvcapid.Daemon import config + from pvcworkerd.Daemon import config import daemon_lib.common as pvc_common import daemon_lib.ceph as pvc_ceph diff --git a/api-daemon/provisioner/examples/script/4-rinse.py b/api-daemon/provisioner/examples/script/4-rinse.py index 1b939b34..0d78c968 100644 --- a/api-daemon/provisioner/examples/script/4-rinse.py +++ b/api-daemon/provisioner/examples/script/4-rinse.py @@ -303,14 +303,14 @@ class VMBuilderScript(VMBuilder): open_zk is exposed from daemon_lib.vmbuilder to provide a context manager for opening connections to the PVC Zookeeper cluster; ensure you also import (and pass it) - the config object from pvcapid.Daemon as well. This context manager then allows + the config object from pvcworkerd.Daemon as well. This context manager then allows the use of various common daemon library functions, without going through the API. """ # Run any imports first import os from daemon_lib.vmbuilder import open_zk - from pvcapid.Daemon import config + from pvcworkerd.Daemon import config import daemon_lib.common as pvc_common import daemon_lib.ceph as pvc_ceph @@ -693,7 +693,7 @@ GRUB_SERIAL_COMMAND="serial --speed=115200 --unit=0 --word=8 --parity=no --stop= # Run any imports first import os from daemon_lib.vmbuilder import open_zk - from pvcapid.Daemon import config + from pvcworkerd.Daemon import config import daemon_lib.common as pvc_common import daemon_lib.ceph as pvc_ceph diff --git a/api-daemon/provisioner/examples/script/5-pfsense.py b/api-daemon/provisioner/examples/script/5-pfsense.py index 05ff9d4b..356a80d7 100644 --- a/api-daemon/provisioner/examples/script/5-pfsense.py +++ b/api-daemon/provisioner/examples/script/5-pfsense.py @@ -359,7 +359,7 @@ class VMBuilderScript(VMBuilder): # Run any imports first; as shown here, you can import anything from the PVC # namespace, as well as (of course) the main Python namespaces from daemon_lib.vmbuilder import open_zk - from pvcapid.Daemon import config + from pvcworkerd.Daemon import config import daemon_lib.common as pvc_common import daemon_lib.ceph as pvc_ceph import json @@ -903,7 +903,7 @@ class VMBuilderScript(VMBuilder): # Run any imports first from daemon_lib.vmbuilder import open_zk - from pvcapid.Daemon import config + from pvcworkerd.Daemon import config import daemon_lib.ceph as pvc_ceph # Use this construct for reversing the list, as the normal reverse() messes with the list