openstack/kolla-ansible
Code Issues Proposed changes

Fix merge_configs.py file when not provide vars parameter

Browse Source 
Use dict.pop(key, None) instead of del dict[key]. dict.pop will not
raise any error when the key is not exist.

TrivialFix

Change-Id: I3808fc865afe6936a5d93eff792e1d1a93ba2085
This commit is contained in:
Jeffrey Zhang 2016-09-26 11:19:46 +08:00
parent 9df73ecc83
commit 5cb0e00b77
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/action_plugins/merge_configs.py
View File

@ -80,8 +80,8 @@ class ActionModule(action.ActionBase):
fakefile.close() fakefile.close()
new_module_args = self._task.args.copy() new_module_args = self._task.args.copy()
del new_module_args['vars'] new_module_args.pop('vars', None)
del new_module_args['sources'] new_module_args.pop('sources', None)
new_module_args.update( new_module_args.update(
dict( dict(