diff options
| author | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2016-09-26 11:19:46 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2016-09-26 11:22:50 +0800 |
| commit | 5cb0e00b7749f88855bf41e185e579c50df0c9db (patch) | |
| tree | 809043c5a899717715a7b761d943a553af520074 /ansible/action_plugins | |
| parent | 9df73ecc836cf35e710af8a2496bba8942543ec8 (diff) | |
| download | kolla-ansible-5cb0e00b7749f88855bf41e185e579c50df0c9db.tar.gz kolla-ansible-5cb0e00b7749f88855bf41e185e579c50df0c9db.zip | |
Fix merge_configs.py file when not provide vars parameter
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
Diffstat (limited to 'ansible/action_plugins')
| -rw-r--r-- | ansible/action_plugins/merge_configs.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ansible/action_plugins/merge_configs.py b/ansible/action_plugins/merge_configs.py index 821b4877d..dd4e382db 100644 --- a/ansible/action_plugins/merge_configs.py +++ b/ansible/action_plugins/merge_configs.py @@ -80,8 +80,8 @@ class ActionModule(action.ActionBase): fakefile.close() new_module_args = self._task.args.copy() - del new_module_args['vars'] - del new_module_args['sources'] + new_module_args.pop('vars', None) + new_module_args.pop('sources', None) new_module_args.update( dict( |