Compare commits

..

No commits in common. "master" and "v0.9.104" have entirely different histories.

10 changed files with 8 additions and 32 deletions

View File

@ -1 +1 @@
0.9.105 0.9.104

View File

@ -1,9 +1,5 @@
## PVC Changelog ## PVC Changelog
###### [v0.9.105](https://github.com/parallelvirtualcluster/pvc/releases/tag/v0.9.105)
* [API Daemon/Provisioner] Corrects some small bugs with OVA handling
###### [v0.9.104](https://github.com/parallelvirtualcluster/pvc/releases/tag/v0.9.104) ###### [v0.9.104](https://github.com/parallelvirtualcluster/pvc/releases/tag/v0.9.104)
* [API Daemon] Fixes a bug that failed uploading of RAW block devices in "storage volume upload" * [API Daemon] Fixes a bug that failed uploading of RAW block devices in "storage volume upload"

View File

@ -179,10 +179,6 @@ def upload_ova(zkhandler, pool, name, ova_size):
} }
retcode = 400 retcode = 400
return output, retcode return output, retcode
else:
ova_script = "default_ova"
else:
ova_script = "ova"
ova_archive = None ova_archive = None
@ -401,14 +397,7 @@ def upload_ova(zkhandler, pool, name, ova_size):
vnc = False vnc = False
serial = True serial = True
retdata, retcode = provisioner.create_template_system( retdata, retcode = provisioner.create_template_system(
name, name, vcpu_count, vram_mb, serial, vnc, vnc_bind=None, ova=ova_id
vcpu_count,
vram_mb,
serial,
vnc,
vnc_bind=None,
ova=ova_id,
migration_max_downtime=300,
) )
if retcode != 200: if retcode != 200:
return retdata, retcode return retdata, retcode
@ -425,7 +414,7 @@ def upload_ova(zkhandler, pool, name, ova_size):
None, None,
None, None,
userdata=None, userdata=None,
script=ova_script, script="default_ova",
ova=name, ova=name,
arguments=None, arguments=None,
) )

View File

@ -221,7 +221,7 @@ def create_template_system(
node_selector=None, node_selector=None,
node_autostart=False, node_autostart=False,
migration_method=None, migration_method=None,
migration_max_downtime=300, migration_max_downtime=None,
ova=None, ova=None,
): ):
if list_template_system(name, is_fuzzy=False)[-1] != 404: if list_template_system(name, is_fuzzy=False)[-1] != 404:

View File

@ -2,7 +2,7 @@ from setuptools import setup
setup( setup(
name="pvc", name="pvc",
version="0.9.105", version="0.9.104",
packages=["pvc.cli", "pvc.lib"], packages=["pvc.cli", "pvc.lib"],
install_requires=[ install_requires=[
"Click", "Click",

View File

@ -121,9 +121,6 @@ def format_bytes_tohuman(databytes):
def format_bytes_fromhuman(datahuman): def format_bytes_fromhuman(datahuman):
if not isinstance(datahuman, str):
datahuman = str(datahuman)
if not re.search(r"[A-Za-z]+", datahuman): if not re.search(r"[A-Za-z]+", datahuman):
dataunit = "B" dataunit = "B"
datasize = float(datahuman) datasize = float(datahuman)

6
debian/changelog vendored
View File

@ -1,9 +1,3 @@
pvc (0.9.105-0) unstable; urgency=high
* [API Daemon/Provisioner] Corrects some small bugs with OVA handling
-- Joshua M. Boniface <joshua@boniface.me> Tue, 19 Nov 2024 14:43:43 -0500
pvc (0.9.104-0) unstable; urgency=high pvc (0.9.104-0) unstable; urgency=high
* [API Daemon] Fixes a bug that failed uploading of RAW block devices in "storage volume upload" * [API Daemon] Fixes a bug that failed uploading of RAW block devices in "storage volume upload"

View File

@ -33,7 +33,7 @@ import os
import signal import signal
# Daemon version # Daemon version
version = "0.9.105" version = "0.9.104"
########################################################## ##########################################################

View File

@ -49,7 +49,7 @@ import re
import json import json
# Daemon version # Daemon version
version = "0.9.105" version = "0.9.104"
########################################################## ##########################################################

View File

@ -58,7 +58,7 @@ from daemon_lib.automirror import (
) )
# Daemon version # Daemon version
version = "0.9.105" version = "0.9.104"
config = cfg.get_configuration() config = cfg.get_configuration()