j3d1/webvirtcloud
1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2024-12-25 15:45:23 +00:00
Code Issues Projects Releases Wiki Activity

Added settings-dev and updated Django

Browse source
This commit is contained in:
Retspen 2015-03-25 22:30:57 +02:00
parent 6da9676299
commit 7803e3a57c
4 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
development/requirements.txt
View file

@ -1,2 +1,2 @@
Django==1.7.5 Django==1.7.7
websockify==0.6.0 websockify==0.6.0

17
instances/views.py
View file

@ -60,15 +60,16 @@ def instances(request):
if connection_manager.host_is_up(comp.type, comp.hostname): if connection_manager.host_is_up(comp.type, comp.hostname):
try: try:
conn = wvmHostDetails(comp, comp.login, comp.password, comp.type) conn = wvmHostDetails(comp, comp.login, comp.password, comp.type)
all_host_vms[comp.id, comp.name] = conn.get_host_instances() if conn.get_host_instances():
for vm, info in conn.get_host_instances().items(): all_host_vms[comp.id, comp.name] = conn.get_host_instances()
try: for vm, info in conn.get_host_instances().items():
check_uuid = Instance.objects.get(compute_id=comp.id, name=vm) try:
if check_uuid.uuid != info['uuid']: check_uuid = Instance.objects.get(compute_id=comp.id, name=vm)
if check_uuid.uuid != info['uuid']:
check_uuid.save()
except Instance.DoesNotExist:
check_uuid = Instance(compute_id=comp.id, name=vm, uuid=info['uuid'])
check_uuid.save() check_uuid.save()
except Instance.DoesNotExist:
check_uuid = Instance(compute_id=comp.id, name=vm, uuid=info['uuid'])
check_uuid.save()
conn.close() conn.close()
except libvirtError as lib_err: except libvirtError as lib_err:
error_messages.append(lib_err) error_messages.append(lib_err)

9
webvirtcloud/settings-dev.py Normal file
View file

@ -0,0 +1,9 @@
"""
Django dev settings for webvirtcloud project.
"""
from settings import *
DEBUG = True
TEMPLATE_DEBUG = True

4
webvirtcloud/settings.py
View file

@ -8,9 +8,9 @@ BASE_DIR = os.path.dirname(os.path.dirname(__file__))
SECRET_KEY = '4y(f4rfqc6f2!i8_vfuu)kav6tdv5#sc=n%o451dm+th0&3uci' SECRET_KEY = '4y(f4rfqc6f2!i8_vfuu)kav6tdv5#sc=n%o451dm+th0&3uci'
DEBUG = True DEBUG = False
TEMPLATE_DEBUG = True TEMPLATE_DEBUG = False
ALLOWED_HOSTS = ['*'] ALLOWED_HOSTS = ['*']