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

Make default_operation optional in netconf_config module (#46333)

Browse source 
Fixes #46257

*  As per netconf rfc default-operation value is optional,
   hence removing the default value for default_operation
   option.

(cherry picked from commit 5e6eb921ae)

* Update changelog
This commit is contained in:
Ganesh Nalawade 2018-10-04 09:47:19 +05:30 committed by Toshio Kuratomi
parent b6810eb37c
commit b6276fe4a4
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelogs/fragments/netconf_config_default_operation.yaml Normal file
View file

@ -0,0 +1,3 @@
---
minor_changes:
- netconf_config - Make default_operation optional in netconf_config module (https://github.com/ansible/ansible/pull/46333)

3
lib/ansible/modules/network/netconf/netconf_config.py
View file

@ -71,7 +71,6 @@ options:
option completely replaces the configuration in the C(target) datastore. If the value is none the C(target) option completely replaces the configuration in the C(target) datastore. If the value is none the C(target)
datastore is unaffected by the configuration in the config option, unless and until the incoming configuration datastore is unaffected by the configuration in the config option, unless and until the incoming configuration
data uses the C(operation) operation to request a different operation. data uses the C(operation) operation to request a different operation.
default: merge
choices: ['merge', 'replace', 'none'] choices: ['merge', 'replace', 'none']
version_added: "2.7" version_added: "2.7"
confirm: confirm:
@ -231,7 +230,7 @@ def main():
source_datastore=dict(aliases=['source']), source_datastore=dict(aliases=['source']),
format=dict(choices=['xml', 'text'], default='xml'), format=dict(choices=['xml', 'text'], default='xml'),
lock=dict(choices=['never', 'always', 'if-supported'], default='always'), lock=dict(choices=['never', 'always', 'if-supported'], default='always'),
default_operation=dict(choices=['merge', 'replace', 'none'], default='merge'), default_operation=dict(choices=['merge', 'replace', 'none']),
confirm=dict(type='int', default=0), confirm=dict(type='int', default=0),
confirm_commit=dict(type='bool', default=False), confirm_commit=dict(type='bool', default=False),
error_option=dict(choices=['stop-on-error', 'continue-on-error', 'rollback-on-error'], default='stop-on-error'), error_option=dict(choices=['stop-on-error', 'continue-on-error', 'rollback-on-error'], default='stop-on-error'),