parallelvirtualcluster/pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 115 Wiki Activity

Add ova as valid name in addition to default_ova

Browse Source
This commit is contained in:
Joshua Boniface
2022-10-21 14:13:40 -04:00
parent cd0b8c23e6
commit 9358949991
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
api-daemon/pvcapid/ova.py
View File

@@ -168,14 +168,16 @@ def delete_ova(zkhandler, name):
@ZKConnection(config) @ZKConnection(config)
def upload_ova(zkhandler, pool, name, ova_size): def upload_ova(zkhandler, pool, name, ova_size):
# Check that we have a default_ova provisioning script # Check that we have an ova or default_ova provisioning script
_, retcode = provisioner.list_script("default_ova", is_fuzzy=False) _, retcode = provisioner.list_script("ova", is_fuzzy=False)
if retcode != 200: if retcode != 200:
output = { _, retcode = provisioner.list_script("default_ova", is_fuzzy=False)
"message": "Did not find a 'default_ova' provisioning script. Please add one with that name, either the example from '/usr/share/pvc/provisioner/examples/script/2-ova.py' or a custom one, before uploading OVAs." if retcode != 200:
} output = {
retcode = 400 "message": "Did not find a 'default_ova' provisioning script. Please add one with that name, either the example from '/usr/share/pvc/provisioner/examples/script/2-ova.py' or a custom one, before uploading OVAs."
return output, retcode }
retcode = 400
return output, retcode
ova_archive = None ova_archive = None