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

Adds the oVirt High Performance (high_performance) VM type.

Browse source
This commit is contained in:
Yaniv Kaul 2018-01-22 20:25:16 +02:00 committed by ansibot
parent 358e63232f
commit 56ce2773c5
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/modules/cloud/misc/ovirt.py
View file

@ -72,8 +72,8 @@ options:
aliases: [ vmmem ] aliases: [ vmmem ]
instance_type: instance_type:
description: description:
- Define whether the instance is a server or desktop. - Define whether the instance is a server, desktop or high_performance.
choices: [ desktop, server ] choices: [ desktop, server, high_performance ]
default: server default: server
aliases: [ vmtype ] aliases: [ vmtype ]
disk_alloc: disk_alloc:
@ -368,7 +368,7 @@ def main():
instance_nic=dict(type='str', aliases=['vmnic']), instance_nic=dict(type='str', aliases=['vmnic']),
instance_network=dict(type='str', default='rhevm', aliases=['vmnetwork']), instance_network=dict(type='str', default='rhevm', aliases=['vmnetwork']),
instance_mem=dict(type='str', aliases=['vmmem']), instance_mem=dict(type='str', aliases=['vmmem']),
instance_type=dict(type='str', default='server', aliases=['vmtype'], choices=['desktop', 'server']), instance_type=dict(type='str', default='server', aliases=['vmtype'], choices=['desktop', 'server', 'high_performance']),
disk_alloc=dict(type='str', default='thin', choices=['preallocated', 'thin']), disk_alloc=dict(type='str', default='thin', choices=['preallocated', 'thin']),
disk_int=dict(type='str', default='virtio', choices=['ide', 'virtio']), disk_int=dict(type='str', default='virtio', choices=['ide', 'virtio']),
instance_os=dict(type='str', aliases=['vmos']), instance_os=dict(type='str', aliases=['vmos']),
@ -405,7 +405,7 @@ def main():
vmdisk_alloc = module.params['disk_alloc'] # thin, preallocated vmdisk_alloc = module.params['disk_alloc'] # thin, preallocated
vmdisk_int = module.params['disk_int'] # disk interface virtio or ide vmdisk_int = module.params['disk_int'] # disk interface virtio or ide
vmos = module.params['instance_os'] # Operating System vmos = module.params['instance_os'] # Operating System
vmtype = module.params['instance_type'] # server or desktop vmtype = module.params['instance_type'] # server, desktop or high_performance
vmcores = module.params['instance_cores'] # number of cores vmcores = module.params['instance_cores'] # number of cores
sdomain = module.params['sdomain'] # storage domain to store disk on sdomain = module.params['sdomain'] # storage domain to store disk on
region = module.params['region'] # oVirt Datacenter region = module.params['region'] # oVirt Datacenter

4
lib/ansible/modules/cloud/ovirt/ovirt_vms.py
View file

@ -176,7 +176,7 @@ options:
description: description:
- Type of the Virtual Machine. - Type of the Virtual Machine.
- Default value is set by oVirt/RHV engine. - Default value is set by oVirt/RHV engine.
choices: [ desktop, server ] choices: [ desktop, server, high_performance ]
quota_id: quota_id:
description: description:
- "Virtual Machine quota ID to be used for disk. By default quota is chosen by oVirt/RHV engine." - "Virtual Machine quota ID to be used for disk. By default quota is chosen by oVirt/RHV engine."
@ -1668,7 +1668,7 @@ def main():
cpu_cores=dict(type='int'), cpu_cores=dict(type='int'),
cpu_shares=dict(type='int'), cpu_shares=dict(type='int'),
cpu_threads=dict(type='int'), cpu_threads=dict(type='int'),
type=dict(type='str', choices=['server', 'desktop']), type=dict(type='str', choices=['server', 'desktop', 'high_performance']),
operating_system=dict(type='str', operating_system=dict(type='str',
choices=[ choices=[
'rhel_6_ppc64', 'other', 'freebsd', 'windows_2003x64', 'windows_10', 'rhel_6_ppc64', 'other', 'freebsd', 'windows_2003x64', 'windows_10',