From 768bf5844ae43a1aa126f440b302c12a765f7801 Mon Sep 17 00:00:00 2001 From: Vatsal Parekh Date: Fri, 22 Mar 2019 18:09:51 +0530 Subject: [PATCH] Added merge_type to kubevirt_template module (#54216) * Added merge_type to kubevirt_template module * Added docs for merge_type --- .../modules/cloud/kubevirt/kubevirt_template.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/ansible/modules/cloud/kubevirt/kubevirt_template.py b/lib/ansible/modules/cloud/kubevirt/kubevirt_template.py index 7d45ff531f..a2a5590b6c 100644 --- a/lib/ansible/modules/cloud/kubevirt/kubevirt_template.py +++ b/lib/ansible/modules/cloud/kubevirt/kubevirt_template.py @@ -35,6 +35,12 @@ options: 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. 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: description: - "A brief, user-friendly name, which can be employed by user interfaces." @@ -208,6 +214,10 @@ TEMPLATE_ARG_SPEC = { ], 'default': 'present' }, + 'merge_type': { + 'type': 'list', + 'choices': ['json', 'merge', 'strategic-merge'] + }, 'objects': { 'type': 'list', },