diff --git a/api-daemon/provisioner/examples/script/1-noop.py b/api-daemon/provisioner/examples/script/1-noop.py index f4df9210..5969b1c9 100644 --- a/api-daemon/provisioner/examples/script/1-noop.py +++ b/api-daemon/provisioner/examples/script/1-noop.py @@ -174,7 +174,7 @@ class VMBuilderScript(VMBuilder): """ # Run any imports first - import pvcapid.libvirt_schema as libvirt_schema + import daemon_lib.libvirt_schema as libvirt_schema import datetime import random diff --git a/api-daemon/provisioner/examples/script/2-ova.py b/api-daemon/provisioner/examples/script/2-ova.py index ad0c80d8..168dc6b4 100644 --- a/api-daemon/provisioner/examples/script/2-ova.py +++ b/api-daemon/provisioner/examples/script/2-ova.py @@ -177,7 +177,7 @@ class VMBuilderScript(VMBuilder): """ # Run any imports first - import pvcapid.libvirt_schema as libvirt_schema + import daemon_lib.libvirt_schema as libvirt_schema import datetime import random @@ -289,7 +289,7 @@ class VMBuilderScript(VMBuilder): """ # Run any imports first - from pvcapid.vmbuilder import open_zk + from daemon_lib.vmbuilder import open_zk from pvcapid.Daemon import config import daemon_lib.common as pvc_common import daemon_lib.ceph as pvc_ceph @@ -383,7 +383,7 @@ class VMBuilderScript(VMBuilder): """ # Run any imports first - from pvcapid.vmbuilder import open_zk + from daemon_lib.vmbuilder import open_zk from pvcapid.Daemon import config import daemon_lib.ceph as pvc_ceph diff --git a/api-daemon/provisioner/examples/script/3-debootstrap.py b/api-daemon/provisioner/examples/script/3-debootstrap.py index eb52fde2..94080691 100644 --- a/api-daemon/provisioner/examples/script/3-debootstrap.py +++ b/api-daemon/provisioner/examples/script/3-debootstrap.py @@ -186,7 +186,7 @@ class VMBuilderScript(VMBuilder): """ # Run any imports first - import pvcapid.libvirt_schema as libvirt_schema + import daemon_lib.libvirt_schema as libvirt_schema import datetime import random @@ -301,7 +301,7 @@ class VMBuilderScript(VMBuilder): This function should use the various exposed PVC commands as indicated to create RBD block devices and map them to the host as required. - open_zk is exposed from pvcapid.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) the config object from pvcapid.Daemon as well. This context manager then allows the use of various common daemon library functions, without going through the API. @@ -309,7 +309,7 @@ class VMBuilderScript(VMBuilder): # Run any imports first import os - from pvcapid.vmbuilder import open_zk + from daemon_lib.vmbuilder import open_zk from pvcapid.Daemon import config import daemon_lib.common as pvc_common import daemon_lib.ceph as pvc_ceph @@ -446,7 +446,7 @@ class VMBuilderScript(VMBuilder): # Run any imports first import os - from pvcapid.vmbuilder import chroot + from daemon_lib.vmbuilder import chroot # The directory we mounted things on earlier during prepare(); this could very well # be exposed as a module-level variable if you so choose @@ -718,7 +718,7 @@ GRUB_DISABLE_LINUX_UUID=false # Run any imports first import os - from pvcapid.vmbuilder import open_zk + from daemon_lib.vmbuilder import open_zk from pvcapid.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 7668dbac..1b939b34 100644 --- a/api-daemon/provisioner/examples/script/4-rinse.py +++ b/api-daemon/provisioner/examples/script/4-rinse.py @@ -186,7 +186,7 @@ class VMBuilderScript(VMBuilder): """ # Run any imports first - import pvcapid.libvirt_schema as libvirt_schema + import daemon_lib.libvirt_schema as libvirt_schema import datetime import random @@ -301,7 +301,7 @@ class VMBuilderScript(VMBuilder): This function should use the various exposed PVC commands as indicated to create RBD block devices and map them to the host as required. - open_zk is exposed from pvcapid.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) the config object from pvcapid.Daemon as well. This context manager then allows the use of various common daemon library functions, without going through the API. @@ -309,7 +309,7 @@ class VMBuilderScript(VMBuilder): # Run any imports first import os - from pvcapid.vmbuilder import open_zk + from daemon_lib.vmbuilder import open_zk from pvcapid.Daemon import config import daemon_lib.common as pvc_common import daemon_lib.ceph as pvc_ceph @@ -446,7 +446,7 @@ class VMBuilderScript(VMBuilder): # Run any imports first import os - from pvcapid.vmbuilder import chroot + from daemon_lib.vmbuilder import chroot import daemon_lib.common as pvc_common # The directory we mounted things on earlier during prepare(); this could very well @@ -692,7 +692,7 @@ GRUB_SERIAL_COMMAND="serial --speed=115200 --unit=0 --word=8 --parity=no --stop= # Run any imports first import os - from pvcapid.vmbuilder import open_zk + from daemon_lib.vmbuilder import open_zk from pvcapid.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 727a0539..05ff9d4b 100644 --- a/api-daemon/provisioner/examples/script/5-pfsense.py +++ b/api-daemon/provisioner/examples/script/5-pfsense.py @@ -243,7 +243,7 @@ class VMBuilderScript(VMBuilder): """ # Run any imports first - import pvcapid.libvirt_schema as libvirt_schema + import daemon_lib.libvirt_schema as libvirt_schema import datetime import random @@ -358,7 +358,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 pvcapid.vmbuilder import open_zk + from daemon_lib.vmbuilder import open_zk from pvcapid.Daemon import config import daemon_lib.common as pvc_common import daemon_lib.ceph as pvc_ceph @@ -902,7 +902,7 @@ class VMBuilderScript(VMBuilder): """ # Run any imports first - from pvcapid.vmbuilder import open_zk + from daemon_lib.vmbuilder import open_zk from pvcapid.Daemon import config import daemon_lib.ceph as pvc_ceph diff --git a/api-daemon/pvcapid/libvirt_schema.py b/daemon-common/libvirt_schema.py old mode 100755 new mode 100644 similarity index 100% rename from api-daemon/pvcapid/libvirt_schema.py rename to daemon-common/libvirt_schema.py