Bump version and split common libraries into separate package

This commit is contained in:
Joshua Boniface 2018-09-12 12:09:52 -04:00
parent f29ba2f458
commit b6c7153401
12 changed files with 33 additions and 16 deletions

View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
ver="0.2" ver="0.3"
git pull git pull
rm ../pvc_* rm ../pvc_*
dh_make -p pvc_${ver} --createorig --single --yes dh_make -p pvc_${ver} --createorig --single --yes

View File

@ -21,7 +21,7 @@
############################################################################### ###############################################################################
import kazoo.client import kazoo.client
import pvcvd.ansiiprint as ansiiprint import ansiiprint
# Child list function # Child list function
def listchildren(zk_conn, key): def listchildren(zk_conn, key):

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
pvc (0.3-1) unstable; urgency=medium
* Code and package reorganization pending additional daemons
-- Joshua Boniface <joshua@boniface.me> Wed, 12 Sep 2018 12:08:28 -0400
pvc (0.2-1) unstable; urgency=medium pvc (0.2-1) unstable; urgency=medium
* Minor version bump with stability fixes * Minor version bump with stability fixes

11
debian/control vendored
View File

@ -6,9 +6,18 @@ Standards-Version: 3.9.8
Homepage: https://www.boniface.me Homepage: https://www.boniface.me
X-Python3-Version: >= 3.2 X-Python3-Version: >= 3.2
Package: pvc-daemon-common
Architecture: all
Depends: python3-kazoo, python3-psutil, python3-apscheduler
Suggests: pvc-virtualization-daemon, pvc-client
Description: Parallel Virtual Cluster common daemon libraries (Python 3)
The Parallel Virtual Cluster provides a management solution for QEMU/KVM virtual clusters.
.
This package installs the common daemon libraries
Package: pvc-virtualization-daemon Package: pvc-virtualization-daemon
Architecture: all Architecture: all
Depends: python3-kazoo, python3-libvirt, python3-psutil, python3-apscheduler, ipmitool, libvirt-daemon-system Depends: pvc-daemon-common, python3-libvirt, ipmitool, libvirt-daemon-system
Suggests: pvc-client Suggests: pvc-client
Description: Parallel Virtual Cluster virtualization daemon (Python 3) Description: Parallel Virtual Cluster virtualization daemon (Python 3)
The Parallel Virtual Cluster provides a management solution for QEMU/KVM virtual clusters, The Parallel Virtual Cluster provides a management solution for QEMU/KVM virtual clusters,

1
debian/pvc-daemon-common.install vendored Normal file
View File

@ -0,0 +1 @@
daemon-common/lib usr/share/pvc

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Enable the servive # Enable the servive
systemctl enable /lib/systemd/system/pvcd.service systemctl enable /lib/systemd/system/pvcvd.service
echo "The PVC daemon has not been started. Create a config file at /etc/pvc/pvcd.conf then start it." echo "The PVC virtualization daemon has not been started. Create a config file at /etc/pvc/pvcvd.conf then start it."

View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
# Disable the service # Disable the service
systemctl disable pvcd.service systemctl disable pvcvd.service

View File

@ -1,14 +1,14 @@
# Parallel Virtual Cluster node daemon unit file # Parallel Virtual Cluster virtualization daemon unit file
[Unit] [Unit]
Description = Parallel Virtual Cluster node daemon Description = Parallel Virtual Cluster virtualization daemon
After = network-online.target libvirtd.service zookeeper.service After = network-online.target libvirtd.service zookeeper.service
[Service] [Service]
Type = simple Type = simple
WorkingDirectory = /usr/share/pvc WorkingDirectory = /usr/share/pvc
Environment = PYTHONUNBUFFERED=true Environment = PYTHONUNBUFFERED=true
Environment = PVCD_CONFIG_FILE=/etc/pvc/pvcd.conf Environment = PVCD_CONFIG_FILE=/etc/pvc/pvcvd.conf
ExecStart = /usr/share/pvc/pvcd.py ExecStart = /usr/share/pvc/pvcvd.py
Restart = on-failure Restart = on-failure
[Install] [Install]

View File

@ -33,8 +33,9 @@ import time
import configparser import configparser
import apscheduler.schedulers.background import apscheduler.schedulers.background
import pvcvd.ansiiprint as ansiiprint import lib.ansiiprint as ansiiprint
import pvcvd.zkhandler as zkhandler import lib.zkhandler as zkhandler
import pvcvd.VMInstance as VMInstance import pvcvd.VMInstance as VMInstance
import pvcvd.NodeInstance as NodeInstance import pvcvd.NodeInstance as NodeInstance

View File

@ -21,8 +21,8 @@
############################################################################### ###############################################################################
import os, sys, psutil, socket, time, libvirt, kazoo.client, threading, subprocess import os, sys, psutil, socket, time, libvirt, kazoo.client, threading, subprocess
import pvcvd.ansiiprint as ansiiprint import lib.ansiiprint as ansiiprint
import pvcvd.zkhandler as zkhandler import lib.zkhandler as zkhandler
class NodeInstance(): class NodeInstance():
# Initialization function # Initialization function

View File

@ -21,8 +21,8 @@
############################################################################### ###############################################################################
import os, sys, uuid, socket, time, threading, libvirt, kazoo.client import os, sys, uuid, socket, time, threading, libvirt, kazoo.client
import pvcvd.ansiiprint as ansiiprint import lib.ansiiprint as ansiiprint
import pvcvd.zkhandler as zkhandler import lib.zkhandler as zkhandler
class VMInstance: class VMInstance:
# Initialization function # Initialization function