From 778a5c3f8e1b8f0a7382589f89293c5ee876562b Mon Sep 17 00:00:00 2001 From: Max Meinhold Date: Thu, 31 Dec 2020 18:37:13 -0500 Subject: [PATCH 1/3] Rename get_boot_order -> set_boot_order s/get/set, since it sets the boot order --- proxstar/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxstar/__init__.py b/proxstar/__init__.py index a6c3ae6..5482952 100644 --- a/proxstar/__init__.py +++ b/proxstar/__init__.py @@ -406,7 +406,7 @@ def delete(vmid): @app.route('/vm//boot_order', methods=['POST']) @auth.oidc_auth -def get_boot_order(vmid): +def set_boot_order(vmid): user = User(session['userinfo']['preferred_username']) connect_proxmox() if user.rtp or int(vmid) in user.allowed_vms: From b02c6bfbc97891a6fb757ef141390d3c9b1b22c2 Mon Sep 17 00:00:00 2001 From: Max Meinhold Date: Thu, 31 Dec 2020 18:44:06 -0500 Subject: [PATCH 2/3] Fix config.local.py in tasks Follow up from b95e4468 in tasks.py --- proxstar/tasks.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proxstar/tasks.py b/proxstar/tasks.py index b194ff7..c0478db 100644 --- a/proxstar/tasks.py +++ b/proxstar/tasks.py @@ -27,8 +27,8 @@ from proxstar.vnc import send_stop_ssh_tunnel logging.basicConfig(format='%(asctime)s %(levelname)s %(message)s', level=logging.INFO) app = Flask(__name__) -if os.path.exists(os.path.join(app.config.get('ROOT_DIR', os.getcwd()), 'config.local.py')): - config = os.path.join(app.config.get('ROOT_DIR', os.getcwd()), 'config.local.py') +if os.path.exists(os.path.join(app.config.get('ROOT_DIR', os.getcwd()), 'config_local.py')): + config = os.path.join(app.config.get('ROOT_DIR', os.getcwd()), 'config_local.py') else: config = os.path.join(app.config.get('ROOT_DIR', os.getcwd()), 'config.py') app.config.from_pyfile(config) From d44698a959d02986d4400f80fbd13c5fdbe6b9cd Mon Sep 17 00:00:00 2001 From: Max Meinhold Date: Thu, 31 Dec 2020 18:44:44 -0500 Subject: [PATCH 3/3] Override boot order defaults on vm creation --- proxstar/tasks.py | 1 + 1 file changed, 1 insertion(+) diff --git a/proxstar/tasks.py b/proxstar/tasks.py index c0478db..af225d1 100644 --- a/proxstar/tasks.py +++ b/proxstar/tasks.py @@ -90,6 +90,7 @@ def create_vm_task(user, name, cores, memory, disk, iso): register_starrs(starrs, name, app.config['STARRS_USER'], vm.get_mac(), ip) set_job_status(job, 'setting VM expiration') get_vm_expire(db, vmid, app.config['VM_EXPIRE_MONTHS']) + vm.set_boot_order(['Hard Disk', 'CD-ROM', 'Network']) logging.info('[{}] VM successfully provisioned.'.format(name)) set_job_status(job, 'complete')