internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 06:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

kubevirt: Fix RS and presets template parameters (#56865)

Browse Source
This commit is contained in:
Ondra Machacek
2019-05-23 20:26:21 +02:00
committed by ansibot
parent f9b43a0f68
commit fa6d328b8f
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ansible/modules/cloud/kubevirt/kubevirt_preset.py
View File

@@ -129,8 +129,11 @@ class KubeVirtVMPreset(KubeVirtRawModule):
# attributes there, remove when we do: # attributes there, remove when we do:
definition['spec']['domain']['devices'] = dict() definition['spec']['domain']['devices'] = dict()
# defaults for template
defaults = {'disks': [], 'volumes': [], 'interfaces': [], 'networks': []}
# Execute the CURD of VM: # Execute the CURD of VM:
dummy, definition = self.construct_vm_definition(KIND, definition, definition) dummy, definition = self.construct_vm_definition(KIND, definition, definition, defaults)
result_crud = self.execute_crud(KIND, definition) result_crud = self.execute_crud(KIND, definition)
changed = result_crud['changed'] changed = result_crud['changed']
result = result_crud.pop('result') result = result_crud.pop('result')

5
lib/ansible/modules/cloud/kubevirt/kubevirt_rs.py
View File

@@ -173,9 +173,12 @@ class KubeVirtVMIRS(KubeVirtRawModule):
if replicas is not None: if replicas is not None:
definition['spec']['replicas'] = replicas definition['spec']['replicas'] = replicas
# defaults for template
defaults = {'disks': [], 'volumes': [], 'interfaces': [], 'networks': []}
# Execute the CURD of VM: # Execute the CURD of VM:
template = definition['spec']['template'] template = definition['spec']['template']
dummy, definition = self.construct_vm_definition(KIND, definition, template) dummy, definition = self.construct_vm_definition(KIND, definition, template, defaults)
result_crud = self.execute_crud(KIND, definition) result_crud = self.execute_crud(KIND, definition)
changed = result_crud['changed'] changed = result_crud['changed']
result = result_crud.pop('result') result = result_crud.pop('result')