From 0cd50f0706e456d5b25d25d9121fd2a069d9a13f Mon Sep 17 00:00:00 2001 From: Ganesh Nalawade Date: Thu, 6 Apr 2017 22:29:33 +0530 Subject: [PATCH] Fix #22880 junos_config update issue (#23333) For update parameter add 'override' as acceptable value. 'override' name is in sync with junos naming convention. --- lib/ansible/modules/network/junos/junos_config.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ansible/modules/network/junos/junos_config.py b/lib/ansible/modules/network/junos/junos_config.py index c5e9b4c1906..a60098ab8fe 100644 --- a/lib/ansible/modules/network/junos/junos_config.py +++ b/lib/ansible/modules/network/junos/junos_config.py @@ -129,13 +129,13 @@ options: candidate configuration. If statements in the loaded configuration conflict with statements in the candidate configuration, the loaded statements replace the candidate ones. - C(overwrite) discards the entire candidate configuration and replaces + C(override) discards the entire candidate configuration and replaces it with the loaded configuration. C(replace) substitutes each hierarchy level in the loaded configuration for the corresponding level. required: false default: merge - choices: ['merge', 'overwrite', 'replace'] + choices: ['merge', 'override', 'replace'] version_added: "2.3" requirements: - junos-eznc @@ -277,7 +277,7 @@ def main(): src_format=dict(choices=['xml', 'text', 'set', 'json']), # update operations - update=dict(default='merge', choices=['merge', 'overwrite', 'replace', 'update']), + update=dict(default='merge', choices=['merge', 'override', 'replace', 'update']), # deprecated replace in Ansible 2.3 replace=dict(type='bool'),