mirror of
https://github.com/ComputerScienceHouse/proxstar.git
synced 2025-03-09 15:40:09 +00:00
Expand options to not use starrs.
This commit is contained in:
parent
c641ba1d1c
commit
33a8cdb523
3 changed files with 39 additions and 21 deletions
|
@ -5,6 +5,7 @@ VM_EXPIRE_MONTHS = int(environ.get('PROXSTAR_VM_EXPIRE_MONTHS', '3'))
|
|||
VNC_CLEANUP_TOKEN = environ.get('PROXSTAR_VNC_CLEANUP_TOKEN', '')
|
||||
|
||||
# Development options
|
||||
# Determines weather or not to run STARRS queries (for doing stuff like checking for available IPs)
|
||||
USE_STARRS = environ.get('PROXSTAR_USE_STARRS', 'True')
|
||||
FORCE_STANDARD_USER = environ.get('PROXSTAR_FORCE_STANDARD_USER', 'False')
|
||||
|
||||
|
|
|
@ -83,14 +83,15 @@ Base.metadata.bind = engine
|
|||
DBSession = sessionmaker(bind=engine)
|
||||
db = DBSession()
|
||||
|
||||
starrs = psycopg2.connect(
|
||||
"dbname='{}' user='{}' host='{}' password='{}'".format(
|
||||
app.config['STARRS_DB_NAME'],
|
||||
app.config['STARRS_DB_USER'],
|
||||
app.config['STARRS_DB_HOST'],
|
||||
app.config['STARRS_DB_PASS'],
|
||||
if app.config['USE_STARRS']:
|
||||
starrs = psycopg2.connect(
|
||||
"dbname='{}' user='{}' host='{}' password='{}'".format(
|
||||
app.config['STARRS_DB_NAME'],
|
||||
app.config['STARRS_DB_USER'],
|
||||
app.config['STARRS_DB_HOST'],
|
||||
app.config['STARRS_DB_PASS'],
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
from proxstar.vm import VM
|
||||
from proxstar.user import User
|
||||
|
@ -202,7 +203,10 @@ def isos():
|
|||
@app.route('/hostname/<string:name>')
|
||||
@auth.oidc_auth
|
||||
def hostname(name):
|
||||
valid, available = check_hostname(starrs, name)
|
||||
if app.config['USE_STARRS']:
|
||||
valid, available = check_hostname(starrs, name)
|
||||
else:
|
||||
valid, available = (True, True)
|
||||
if not valid:
|
||||
return 'invalid'
|
||||
if not available:
|
||||
|
@ -358,7 +362,7 @@ def vm_renew(vmid):
|
|||
vm = VM(vmid)
|
||||
renew_vm_expire(db, vmid, app.config['VM_EXPIRE_MONTHS'])
|
||||
for interface in vm.interfaces:
|
||||
if interface[2] != 'No IP':
|
||||
if interface[2] != 'No IP' and app.config['USE_STARRS']:
|
||||
renew_ip(starrs, interface[2])
|
||||
return '', 200
|
||||
else:
|
||||
|
@ -464,7 +468,11 @@ def create():
|
|||
if usage_check:
|
||||
return usage_check
|
||||
else:
|
||||
valid, available = check_hostname(starrs, name)
|
||||
if app.config['USE_STARRS']:
|
||||
valid, available = check_hostname(starrs, name)
|
||||
else:
|
||||
valid, available = (True, True)
|
||||
|
||||
if valid and available:
|
||||
if template == 'none':
|
||||
q.enqueue(
|
||||
|
|
|
@ -64,7 +64,8 @@ def create_vm_task(user, name, cores, memory, disk, iso):
|
|||
job = get_current_job()
|
||||
proxmox = connect_proxmox()
|
||||
db = connect_db()
|
||||
starrs = connect_starrs()
|
||||
if app.config['USE_STARRS']:
|
||||
starrs = connect_starrs()
|
||||
logging.info('[{}] Creating VM.'.format(name))
|
||||
set_job_status(job, 'creating VM')
|
||||
vmid = create_vm(proxmox, user, name, cores, memory, disk, iso)
|
||||
|
@ -99,13 +100,15 @@ def create_vm_task(user, name, cores, memory, disk, iso):
|
|||
def delete_vm_task(vmid):
|
||||
with app.app_context():
|
||||
db = connect_db()
|
||||
starrs = connect_starrs()
|
||||
if app.config['USE_STARRS']:
|
||||
starrs = connect_starrs()
|
||||
vm = VM(vmid)
|
||||
# do this before deleting the VM since it is hard to reconcile later
|
||||
retry = 0
|
||||
while retry < 3:
|
||||
try:
|
||||
delete_starrs(starrs, vm.name)
|
||||
if app.config['USE_STARRS']:
|
||||
delete_starrs(starrs, vm.name)
|
||||
break
|
||||
except:
|
||||
retry += 1
|
||||
|
@ -127,7 +130,8 @@ def process_expiring_vms_task():
|
|||
with app.app_context():
|
||||
proxmox = connect_proxmox()
|
||||
db = connect_db()
|
||||
connect_starrs()
|
||||
if app.config['USE_STARRS']:
|
||||
connect_starrs()
|
||||
pools = get_pools(proxmox, db)
|
||||
expired_vms = []
|
||||
for pool in pools:
|
||||
|
@ -168,7 +172,8 @@ def setup_template_task(template_id, name, user, ssh_key, cores, memory):
|
|||
with app.app_context():
|
||||
job = get_current_job()
|
||||
proxmox = connect_proxmox()
|
||||
starrs = connect_starrs()
|
||||
if app.config['USE_STARRS']:
|
||||
starrs = connect_starrs()
|
||||
db = connect_db()
|
||||
logging.info('[{}] Retrieving template info for template {}.'.format(name, template_id))
|
||||
get_template(db, template_id)
|
||||
|
@ -190,11 +195,13 @@ def setup_template_task(template_id, name, user, ssh_key, cores, memory):
|
|||
set_job_status(job, 'failed to provision')
|
||||
delete_vm_task(vmid)
|
||||
return
|
||||
logging.info('[{}] Registering in STARRS.'.format(name))
|
||||
set_job_status(job, 'registering in STARRS')
|
||||
|
||||
if app.config['USE_STARRS']:
|
||||
logging.info('[{}] Registering in STARRS.'.format(name))
|
||||
set_job_status(job, 'registering in STARRS')
|
||||
ip = get_next_ip(starrs, app.config['STARRS_IP_RANGE'])
|
||||
register_starrs(starrs, name, app.config['STARRS_USER'], vm.get_mac(), ip)
|
||||
vm = VM(vmid)
|
||||
ip = get_next_ip(starrs, app.config['STARRS_IP_RANGE'])
|
||||
register_starrs(starrs, name, app.config['STARRS_USER'], vm.get_mac(), ip)
|
||||
get_vm_expire(db, vmid, app.config['VM_EXPIRE_MONTHS'])
|
||||
logging.info('[{}] Setting CPU and memory.'.format(name))
|
||||
set_job_status(job, 'setting CPU and memory')
|
||||
|
@ -205,8 +212,10 @@ def setup_template_task(template_id, name, user, ssh_key, cores, memory):
|
|||
vm.set_ci_user(user)
|
||||
vm.set_ci_ssh_key(ssh_key)
|
||||
vm.set_ci_network()
|
||||
logging.info('[{}] Waiting for STARRS to propogate before starting VM.'.format(name))
|
||||
set_job_status(job, 'waiting for STARRS')
|
||||
|
||||
if app.config['USE_STARRS']:
|
||||
logging.info('[{}] Waiting for STARRS to propogate before starting VM.'.format(name))
|
||||
set_job_status(job, 'waiting for STARRS')
|
||||
job.save_meta()
|
||||
time.sleep(90)
|
||||
logging.info('[{}] Starting VM.'.format(name))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue