Import from pvcworkerd not pvcapid

This commit is contained in:
Joshua Boniface 2023-12-09 12:22:19 -05:00
parent 0bda095571
commit f01c12c86b
4 changed files with 10 additions and 10 deletions

View File

@ -290,7 +290,7 @@ class VMBuilderScript(VMBuilder):
# Run any imports first # Run any imports first
from daemon_lib.vmbuilder import open_zk 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.common as pvc_common
import daemon_lib.ceph as pvc_ceph import daemon_lib.ceph as pvc_ceph
import os import os
@ -384,7 +384,7 @@ class VMBuilderScript(VMBuilder):
# Run any imports first # Run any imports first
from daemon_lib.vmbuilder import open_zk from daemon_lib.vmbuilder import open_zk
from pvcapid.Daemon import config from pvcworkerd.Daemon import config
import daemon_lib.ceph as pvc_ceph import daemon_lib.ceph as pvc_ceph
for volume in list(reversed(self.vm_data["volumes"])): for volume in list(reversed(self.vm_data["volumes"])):

View File

@ -303,14 +303,14 @@ class VMBuilderScript(VMBuilder):
open_zk is exposed from daemon_lib.vmbuilder to provide a context manager for opening 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) 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. the use of various common daemon library functions, without going through the API.
""" """
# Run any imports first # Run any imports first
import os import os
from daemon_lib.vmbuilder import open_zk 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.common as pvc_common
import daemon_lib.ceph as pvc_ceph import daemon_lib.ceph as pvc_ceph
@ -719,7 +719,7 @@ GRUB_DISABLE_LINUX_UUID=false
# Run any imports first # Run any imports first
import os import os
from daemon_lib.vmbuilder import open_zk 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.common as pvc_common
import daemon_lib.ceph as pvc_ceph import daemon_lib.ceph as pvc_ceph

View File

@ -303,14 +303,14 @@ class VMBuilderScript(VMBuilder):
open_zk is exposed from daemon_lib.vmbuilder to provide a context manager for opening 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) 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. the use of various common daemon library functions, without going through the API.
""" """
# Run any imports first # Run any imports first
import os import os
from daemon_lib.vmbuilder import open_zk 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.common as pvc_common
import daemon_lib.ceph as pvc_ceph 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 # Run any imports first
import os import os
from daemon_lib.vmbuilder import open_zk 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.common as pvc_common
import daemon_lib.ceph as pvc_ceph import daemon_lib.ceph as pvc_ceph

View File

@ -359,7 +359,7 @@ class VMBuilderScript(VMBuilder):
# Run any imports first; as shown here, you can import anything from the PVC # Run any imports first; as shown here, you can import anything from the PVC
# namespace, as well as (of course) the main Python namespaces # namespace, as well as (of course) the main Python namespaces
from daemon_lib.vmbuilder import open_zk 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.common as pvc_common
import daemon_lib.ceph as pvc_ceph import daemon_lib.ceph as pvc_ceph
import json import json
@ -903,7 +903,7 @@ class VMBuilderScript(VMBuilder):
# Run any imports first # Run any imports first
from daemon_lib.vmbuilder import open_zk from daemon_lib.vmbuilder import open_zk
from pvcapid.Daemon import config from pvcworkerd.Daemon import config
import daemon_lib.ceph as pvc_ceph import daemon_lib.ceph as pvc_ceph
# Use this construct for reversing the list, as the normal reverse() messes with the list # Use this construct for reversing the list, as the normal reverse() messes with the list