wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lxc_container: 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: https://github.com/ansible/ansible-modules-extras/issues/430
This commit is contained in:
Kevin Carter 2015-06-01 15:15:37 -05:00 committed by Matt Clay
parent 25f423e42f
commit c7a04c0863
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/modules/extras/cloud/lxc/lxc_container.py
View file

@ -383,9 +383,7 @@ EXAMPLES = """
try: try:
import lxc import lxc
except ImportError: except ImportError:
msg = 'The lxc module is not importable. Check the requirements.' HAS_LXC = False
print("failed=True msg='%s'" % msg)
raise SystemExit(msg)
# LXC_COMPRESSION_MAP is a map of available compression types when creating # LXC_COMPRESSION_MAP is a map of available compression types when creating
@ -1706,6 +1704,11 @@ def main():
supports_check_mode=False, supports_check_mode=False,
) )
if not HAS_LXC:
module.fail_json(
msg='The `lxc` module is not importable. Check the requirements.'
)
lv_name = module.params.get('lv_name') lv_name = module.params.get('lv_name')
if not lv_name: if not lv_name:
module.params['lv_name'] = module.params.get('name') module.params['lv_name'] = module.params.get('name')