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

volume filename extensions reorganized.

Browse source
This commit is contained in:
catborise 2018-07-20 13:42:13 +03:00
parent b7150a1fae
commit e7ecf29359
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
instances/views.py
View file

@ -365,7 +365,11 @@ def instance(request, compute_id, vname):
cache_modes = sorted(conn.get_cache_modes().items()) cache_modes = sorted(conn.get_cache_modes().items())
default_cache = settings.INSTANCE_VOLUME_DEFAULT_CACHE default_cache = settings.INSTANCE_VOLUME_DEFAULT_CACHE
default_format = settings.INSTANCE_VOLUME_DEFAULT_FORMAT default_format = settings.INSTANCE_VOLUME_DEFAULT_FORMAT
default_extension = settings.INSTANCE_VOLUME_DEFAULT_FILE_EXTENSION
formats = conn.get_image_formats() formats = conn.get_image_formats()
extensions = conn.get_file_extensions()
busses = conn.get_busses() busses = conn.get_busses()
default_bus = settings.INSTANCE_VOLUME_DEFAULT_BUS default_bus = settings.INSTANCE_VOLUME_DEFAULT_BUS
show_access_root_password = settings.SHOW_ACCESS_ROOT_PASSWORD show_access_root_password = settings.SHOW_ACCESS_ROOT_PASSWORD
@ -908,7 +912,7 @@ def inst_graph(request, compute_id, vname):
@login_required @login_required
def guess_mac_address(request, vname): def guess_mac_address(request, vname):
dhcp_file = '/srv/webvirtcloud/dhcpd.conf' dhcp_file = '/srv/webvirtcloud/dhcpd.conf'
data = { 'vname': vname, 'mac': '52:54:00:' } data = {'vname': vname, 'mac': '52:54:00:'}
if os.path.isfile(dhcp_file): if os.path.isfile(dhcp_file):
with open(dhcp_file, 'r') as f: with open(dhcp_file, 'r') as f:
name_found = False name_found = False