Skip to content

better image table handling #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jscotka wants to merge 4 commits into
base: master
Choose a base branch
from
Open

better image table handling #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7ef981e
better image table handling
jscotka Mar 19, 2015
109d89e
missing : after else
jscotka Mar 19, 2015
2e41e51
cleaning against https://travis-ci.org/simon3z/virt-deploy/jobs/55027342
jscotka Mar 19, 2015
b593fc0
added dependency to .tox file
jscotka Mar 19, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ deps =
lxml
mock
netaddr
libosinfo
commands =
python -m unittest discover

Expand Down
11 changes: 9 additions & 2 deletions virtdeploy/drivers/libvirt.py
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,17 @@ def instance_delete(self, vmid):


def _get_image_os(image):
try:
if image in _IMAGE_OS_TABLE:
return _IMAGE_OS_TABLE[image]
except KeyError:
stdout, _ = execute(('osinfo-query', '--fields=short-id', 'os'),
stdout=subprocess.PIPE)
stdtable=stdout.split()
if image.replace('-', '') in stdtable:
return image.replace('-', '')
if image in stdtable:
return image
else:
return "fedora20"


def _create_base(template, arch, repository):
Expand Down