diff options
| author | ikelos <mike.auty@gmail.com> | 2016-12-12 20:57:29 +0000 |
|---|---|---|
| committer | Peter Sprygada <psprygada@ansible.com> | 2016-12-12 15:58:03 -0500 |
| commit | abc0eeac024e4f9448de133135f1bbda3ef1a5b8 (patch) | |
| tree | a2dd45379ec4d7772e7ca48b2bf7117231992d2c | |
| parent | 886f8d224ea4d2dbacf52d579089a51ba9dbdef6 (diff) | |
| download | ansible-abc0eeac024e4f9448de133135f1bbda3ef1a5b8.tar.gz | |
Fix overwrite parameter in module_utils.junos (#18671)
The overwrite parameter is forcibly set to false, meaning a module
passing that parameter will have no effect. The overwrite facility
is necessary to ensure that conflicting options can be written the
configuration (which, in replace mode, they cannot).
This change ensures that if overwrite is set, it will not be changed
to False in the logic.
(cherry picked from commit 9e5d4de49aa947585a9ee8987cb0da90680c034a)
| -rw-r--r-- | lib/ansible/module_utils/junos.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ansible/module_utils/junos.py b/lib/ansible/module_utils/junos.py index 3d24b86037..dbdae283f1 100644 --- a/lib/ansible/module_utils/junos.py +++ b/lib/ansible/module_utils/junos.py @@ -184,8 +184,8 @@ class Netconf(object): merge = False overwrite = False elif overwrite: - merge = True - overwrite = False + merge = False + overwrite = True else: merge = True overwrite = False |