ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Added merge_type to kubevirt_template module (#54216)

Browse source 
* Added merge_type to kubevirt_template module

* Added docs for merge_type
This commit is contained in:
Vatsal Parekh 2019-03-22 18:09:51 +05:30 committed by ansibot
parent 76f1f96163
commit 768bf5844a
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/modules/cloud/kubevirt/kubevirt_template.py
View file

@ -35,6 +35,12 @@ options:
user must use Ansible structure of the parameters not the Kubernetes API structure. For more information user must use Ansible structure of the parameters not the Kubernetes API structure. For more information
please take a look at M(kubevirt_vm) module and at EXAMPLES section, where you can see example. please take a look at M(kubevirt_vm) module and at EXAMPLES section, where you can see example.
type: list type: list
merge_type:
description:
- Whether to override the default patch merge approach with a specific type. By default, the strategic
merge will typically be used.
type: list
choices: [ json, merge, strategic-merge ]
display_name: display_name:
description: description:
- "A brief, user-friendly name, which can be employed by user interfaces." - "A brief, user-friendly name, which can be employed by user interfaces."
@ -208,6 +214,10 @@ TEMPLATE_ARG_SPEC = {
], ],
'default': 'present' 'default': 'present'
}, },
'merge_type': {
'type': 'list',
'choices': ['json', 'merge', 'strategic-merge']
},
'objects': { 'objects': {
'type': 'list', 'type': 'list',
}, },