diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-26 10:51:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-26 10:51:27 +0000 |
| commit | f3595f2317fd189f9be7fe846d155e221dae1818 (patch) | |
| tree | 6bf5e055c025b138f8732e7b525c8af114629533 | |
| parent | ffbd2c0956d30557f91436828a0e75dec988f8e1 (diff) | |
| parent | 5cb0e00b7749f88855bf41e185e579c50df0c9db (diff) | |
| download | kolla-f3595f2317fd189f9be7fe846d155e221dae1818.tar.gz kolla-f3595f2317fd189f9be7fe846d155e221dae1818.zip | |
Merge "Fix merge_configs.py file when not provide vars parameter"
| -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( |