From 56ce2773c587622b34d2a550cb5459ec4c839c1d Mon Sep 17 00:00:00 2001 From: Yaniv Kaul Date: Mon, 22 Jan 2018 20:25:16 +0200 Subject: [PATCH] Adds the oVirt High Performance (high_performance) VM type. --- lib/ansible/modules/cloud/misc/ovirt.py | 8 ++++---- lib/ansible/modules/cloud/ovirt/ovirt_vms.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/ansible/modules/cloud/misc/ovirt.py b/lib/ansible/modules/cloud/misc/ovirt.py index 2edde96056..3708f9b96a 100644 --- a/lib/ansible/modules/cloud/misc/ovirt.py +++ b/lib/ansible/modules/cloud/misc/ovirt.py @@ -72,8 +72,8 @@ options: aliases: [ vmmem ] instance_type: description: - - Define whether the instance is a server or desktop. - choices: [ desktop, server ] + - Define whether the instance is a server, desktop or high_performance. + choices: [ desktop, server, high_performance ] default: server aliases: [ vmtype ] disk_alloc: @@ -368,7 +368,7 @@ def main(): instance_nic=dict(type='str', aliases=['vmnic']), instance_network=dict(type='str', default='rhevm', aliases=['vmnetwork']), 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_int=dict(type='str', default='virtio', choices=['ide', 'virtio']), instance_os=dict(type='str', aliases=['vmos']), @@ -405,7 +405,7 @@ def main(): vmdisk_alloc = module.params['disk_alloc'] # thin, preallocated vmdisk_int = module.params['disk_int'] # disk interface virtio or ide 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 sdomain = module.params['sdomain'] # storage domain to store disk on region = module.params['region'] # oVirt Datacenter diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_vms.py b/lib/ansible/modules/cloud/ovirt/ovirt_vms.py index 838c564921..f91d46ce8d 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_vms.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_vms.py @@ -176,7 +176,7 @@ options: description: - Type of the Virtual Machine. - Default value is set by oVirt/RHV engine. - choices: [ desktop, server ] + choices: [ desktop, server, high_performance ] quota_id: description: - "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_shares=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', choices=[ 'rhel_6_ppc64', 'other', 'freebsd', 'windows_2003x64', 'windows_10',