cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix #22880 junos_config update issue (#23333)

Browse source 
For update parameter add 'override' as acceptable value.
'override' name is in sync with junos naming convention.
(cherry picked from commit 0cd50f0706)
This commit is contained in:
Ganesh Nalawade 2017-04-06 22:29:33 +05:30 committed by Nathaniel Case
parent e2a1ea09dc
commit ede49d9115
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/modules/network/junos/junos_config.py
View file

@ -129,13 +129,13 @@ options:
candidate configuration. If statements in the loaded configuration candidate configuration. If statements in the loaded configuration
conflict with statements in the candidate configuration, the loaded conflict with statements in the candidate configuration, the loaded
statements replace the candidate ones. 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. it with the loaded configuration.
C(replace) substitutes each hierarchy level in the loaded configuration C(replace) substitutes each hierarchy level in the loaded configuration
for the corresponding level. for the corresponding level.
required: false required: false
default: merge default: merge
choices: ['merge', 'overwrite', 'replace'] choices: ['merge', 'override', 'replace']
version_added: "2.3" version_added: "2.3"
requirements: requirements:
- junos-eznc - junos-eznc
@ -276,7 +276,7 @@ def main():
src_format=dict(choices=['xml', 'text', 'set', 'json']), src_format=dict(choices=['xml', 'text', 'set', 'json']),
# update operations # 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 # deprecated replace in Ansible 2.3
replace=dict(type='bool'), replace=dict(type='bool'),