From 6d494a59a542b4faf5de01c2e2e28cbbf3e5b27f Mon Sep 17 00:00:00 2001 From: Jordan Rodgers Date: Thu, 30 Nov 2017 19:45:57 -0500 Subject: [PATCH] remove print statements and actually use the provided disk size --- app.py | 8 +++----- proxmox.py | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app.py b/app.py index d7d2396..8b4de28 100644 --- a/app.py +++ b/app.py @@ -62,16 +62,14 @@ def get_create(): memory = request.form['memory'] disk = request.form['disk'] vmid, mac = create_vm(proxmox, starrs, user, name, cores, memory, disk) - print( - register_starrs(starrs, name, user, mac, - get_next_ip(starrs, '49net Public Fixed')[0][0])) + register_starrs(starrs, name, user, mac, + get_next_ip(starrs, '49net Public Fixed')[0][0]) return redirect("/proxstar/vm/{}".format(vmid)) @app.route("/delete", methods=['POST']) def delete(): vmid = request.form['delete'] - print(vmid) vmname = get_vm_config(proxmox, vmid)['name'] return render_template( 'confirm_delete.html', username='com6056', vmid=vmid, vmname=vmname) @@ -82,7 +80,7 @@ def confirm_delete(): vmid = request.form['delete'] vmname = get_vm_config(proxmox, vmid)['name'] delete_vm(proxmox, starrs, vmid) - print(delete_starrs(starrs, vmname)) + delete_starrs(starrs, vmname) time.sleep(3) return redirect("/proxstar") diff --git a/proxmox.py b/proxmox.py index e515ea7..6bdd345 100644 --- a/proxmox.py +++ b/proxmox.py @@ -105,7 +105,7 @@ def create_vm(proxmox, starrs, user, name, cores, memory, disk): cores=cores, memory=memory, storage='ceph', - virtio0='ceph:10', + virtio0="ceph:{}".format(disk), net0='virtio,bridge=vmbr0', pool=user) time.sleep(3)