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

Add missing msg keyword for fail_json (#34387)

Browse source 
Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
This commit is contained in:
Abhijeet Kasurde 2018-01-03 15:14:53 +05:30 committed by ansibot
parent 6a322637c4
commit daae4d922a
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/modules/cloud/amazon/lightsail.py
View file

@ -413,7 +413,7 @@ def core(module):
client = boto3_conn(module, conn_type='client', resource='lightsail',
region=region, endpoint=ec2_url, **aws_connect_kwargs)
except (botocore.exceptions.ClientError, botocore.exceptions.ValidationError) as e:
module.fail_json('Failed while connecting to the lightsail service: %s' % e, exception=traceback.format_exc())
module.fail_json(msg='Failed while connecting to the lightsail service: %s' % e, exception=traceback.format_exc())
changed = False
state = module.params['state']
@ -468,5 +468,6 @@ def main():
except (botocore.exceptions.ClientError, Exception) as e:
module.fail_json(msg=str(e), exception=traceback.format_exc())
if __name__ == '__main__':
main()

4
lib/ansible/modules/packaging/os/package_facts.py
View file

@ -151,7 +151,7 @@ def rpm_package_list():
try:
import rpm
except ImportError:
module.fail_json('Unable to use the rpm python bindings, please ensure they are installed under the python the module runs under')
module.fail_json(msg='Unable to use the rpm python bindings, please ensure they are installed under the python the module runs under')
trans_set = rpm.TransactionSet()
installed_packages = {}
@ -174,7 +174,7 @@ def apt_package_list():
try:
import apt
except ImportError:
module.fail_json('Unable to use the apt python bindings, please ensure they are installed under the python the module runs under')
module.fail_json(msg='Unable to use the apt python bindings, please ensure they are installed under the python the module runs under')
apt_cache = apt.Cache()
installed_packages = {}