cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

virt: remove BabyJSON

Browse source 
Removed the usage of baby json. This is in response to the fact
that the baby json functionality was removed in Ansible 1.8

Ref: #430
This commit is contained in:
Maciej Delmanowski 2015-07-18 13:54:30 +02:00 committed by Matt Clay
parent f6d66bb3db
commit 1b6980b086
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/modules/extras/cloud/misc/virt.py
View file

@ -93,8 +93,9 @@ import sys
try: try:
import libvirt import libvirt
except ImportError: except ImportError:
print "failed=True msg='libvirt python module unavailable'" HAS_VIRT = False
sys.exit(1) else:
HAS_VIRT = True
ALL_COMMANDS = [] ALL_COMMANDS = []
VM_COMMANDS = ['create','status', 'start', 'stop', 'pause', 'unpause', VM_COMMANDS = ['create','status', 'start', 'stop', 'pause', 'unpause',
@ -481,6 +482,11 @@ def main():
xml = dict(), xml = dict(),
)) ))
if not HAS_VIRT:
module.fail_json(
msg='The `libvirt` module is not importable. Check the requirements.'
)
rc = VIRT_SUCCESS rc = VIRT_SUCCESS
try: try:
rc, result = core(module) rc, result = core(module)