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

expect default value of version param as None (#35790)

Browse source
This commit is contained in:
Paweł Krupa 2018-02-08 18:10:19 +01:00 committed by Sam Doran
parent 03c73e2bbb
commit 88f1f40aca
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/monitoring/grafana_plugin.py
View file

@ -154,7 +154,7 @@ def grafana_plugin(module, params):
'changed': False, 'changed': False,
'version': grafana_plugin_version} 'version': grafana_plugin_version}
else: else:
if params['version'] == 'latest': if params['version'] == 'latest' or params['version'] is None:
cmd = '{} update {}'.format(grafana_cli, params['name']) cmd = '{} update {}'.format(grafana_cli, params['name'])
else: else:
cmd = '{} install {} {}'.format(grafana_cli, params['name'], params['version']) cmd = '{} install {} {}'.format(grafana_cli, params['name'], params['version'])
@ -164,7 +164,7 @@ def grafana_plugin(module, params):
'version': grafana_plugin_version} 'version': grafana_plugin_version}
else: else:
if 'version' in params: if 'version' in params:
if params['version'] == 'latest': if params['version'] == 'latest' or params['version'] is None:
cmd = '{} install {}'.format(grafana_cli, params['name']) cmd = '{} install {}'.format(grafana_cli, params['name'])
else: else:
cmd = '{} install {} {}'.format(grafana_cli, params['name'], params['version']) cmd = '{} install {} {}'.format(grafana_cli, params['name'], params['version'])