wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add support to start a vm and put it on hold in one_vm (#56841)

Browse source 
* Add support to start a vm and put it on hold in one_vm

* Add version_added to vm_start_on_hold option for one_vm

* Add version_added to vm_start_on_hold option for one_vm#2

* Add version_added to vm_start_on_hold option for one_vm#3

* Fix indentation for one_vm
This commit is contained in:
Ankur Gupta 2019-05-28 17:28:13 +05:30 committed by ansibot
parent 61b48778a7
commit a40dc1174e
1 changed files with 32 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
lib/ansible/modules/cloud/opennebula/one_vm.py
View file

@ -61,6 +61,11 @@ options:
template_id: template_id:
description: description:
- ID of a VM template to use to create a new instance - ID of a VM template to use to create a new instance
vm_start_on_hold:
description:
- Set to true to put vm on hold while creating
default: False
version_added: '2.9'
instance_ids: instance_ids:
description: description:
- A list of instance ids used for states':' C(absent), C(running), C(rebooted), C(poweredoff) - A list of instance ids used for states':' C(absent), C(running), C(rebooted), C(poweredoff)
@ -182,6 +187,11 @@ EXAMPLES = '''
- debug: - debug:
msg: result msg: result
# Deploy a new VM on hold
- one_vm:
template_name: 'app1_template'
vm_start_on_hold: 'True'
# Deploy a new VM and set its name to 'foo' # Deploy a new VM and set its name to 'foo'
- one_vm: - one_vm:
template_name: 'app1_template' template_name: 'app1_template'
@ -847,14 +857,14 @@ def create_nics_str(network_attrs_list):
return nics_str return nics_str
def create_vm(module, client, template_id, attributes_dict, labels_list, disk_size, network_attrs_list): def create_vm(module, client, template_id, attributes_dict, labels_list, disk_size, network_attrs_list, vm_start_on_hold):
if attributes_dict: if attributes_dict:
vm_name = attributes_dict.get('NAME', '') vm_name = attributes_dict.get('NAME', '')
disk_str = create_disk_str(module, client, template_id, disk_size) disk_str = create_disk_str(module, client, template_id, disk_size)
vm_extra_template_str = create_attributes_str(attributes_dict, labels_list) + create_nics_str(network_attrs_list) + disk_str vm_extra_template_str = create_attributes_str(attributes_dict, labels_list) + create_nics_str(network_attrs_list) + disk_str
vm_id = client.call('template.instantiate', template_id, vm_name, False, vm_extra_template_str) vm_id = client.call('template.instantiate', template_id, vm_name, vm_start_on_hold, vm_extra_template_str)
vm = get_vm_by_id(client, vm_id) vm = get_vm_by_id(client, vm_id)
return get_vm_info(client, vm) return get_vm_info(client, vm)
@ -946,7 +956,7 @@ def get_all_vms_by_attributes(client, attributes_dict, labels_list):
return vm_list return vm_list
def create_count_of_vms(module, client, template_id, count, attributes_dict, labels_list, disk_size, network_attrs_list, wait, wait_timeout): def create_count_of_vms(module, client, template_id, count, attributes_dict, labels_list, disk_size, network_attrs_list, wait, wait_timeout, vm_start_on_hold):
new_vms_list = [] new_vms_list = []
vm_name = '' vm_name = ''
@ -975,21 +985,26 @@ def create_count_of_vms(module, client, template_id, count, attributes_dict, lab
new_vm_name += next_index new_vm_name += next_index
# Update NAME value in the attributes in case there is index # Update NAME value in the attributes in case there is index
attributes_dict['NAME'] = new_vm_name attributes_dict['NAME'] = new_vm_name
new_vm_dict = create_vm(module, client, template_id, attributes_dict, labels_list, disk_size, network_attrs_list) new_vm_dict = create_vm(module, client, template_id, attributes_dict, labels_list, disk_size, network_attrs_list, vm_start_on_hold)
new_vm_id = new_vm_dict.get('vm_id') new_vm_id = new_vm_dict.get('vm_id')
new_vm = get_vm_by_id(client, new_vm_id) new_vm = get_vm_by_id(client, new_vm_id)
new_vms_list.append(new_vm) new_vms_list.append(new_vm)
count -= 1 count -= 1
if wait: if vm_start_on_hold:
for vm in new_vms_list: if wait:
wait_for_running(module, vm, wait_timeout) for vm in new_vms_list:
wait_for_hold(module, vm, wait_timeout)
else:
if wait:
for vm in new_vms_list:
wait_for_running(module, vm, wait_timeout)
return True, new_vms_list, [] return True, new_vms_list, []
def create_exact_count_of_vms(module, client, template_id, exact_count, attributes_dict, count_attributes_dict, def create_exact_count_of_vms(module, client, template_id, exact_count, attributes_dict, count_attributes_dict,
labels_list, count_labels_list, disk_size, network_attrs_list, hard, wait, wait_timeout): labels_list, count_labels_list, disk_size, network_attrs_list, hard, wait, wait_timeout, vm_start_on_hold):
vm_list = get_all_vms_by_attributes(client, count_attributes_dict, count_labels_list) vm_list = get_all_vms_by_attributes(client, count_attributes_dict, count_labels_list)
@ -1006,7 +1021,7 @@ def create_exact_count_of_vms(module, client, template_id, exact_count, attribut
if vm_count_diff > 0: if vm_count_diff > 0:
# Add more VMs # Add more VMs
changed, instances_list, tagged_instances = create_count_of_vms(module, client, template_id, vm_count_diff, attributes_dict, changed, instances_list, tagged_instances = create_count_of_vms(module, client, template_id, vm_count_diff, attributes_dict,
labels_list, disk_size, network_attrs_list, wait, wait_timeout) labels_list, disk_size, network_attrs_list, wait, wait_timeout, vm_start_on_hold)
tagged_instances_list += instances_list tagged_instances_list += instances_list
elif vm_count_diff < 0: elif vm_count_diff < 0:
@ -1068,6 +1083,10 @@ def wait_for_done(module, vm, wait_timeout):
return wait_for_state(module, vm, wait_timeout, lambda state, lcm_state: (state in [VM_STATES.index('DONE')])) return wait_for_state(module, vm, wait_timeout, lambda state, lcm_state: (state in [VM_STATES.index('DONE')]))
def wait_for_hold(module, vm, wait_timeout):
return wait_for_state(module, vm, wait_timeout, lambda state, lcm_state: (state in [VM_STATES.index('HOLD')]))
def wait_for_poweroff(module, vm, wait_timeout): def wait_for_poweroff(module, vm, wait_timeout):
return wait_for_state(module, vm, wait_timeout, lambda state, lcm_state: (state in [VM_STATES.index('POWEROFF')])) return wait_for_state(module, vm, wait_timeout, lambda state, lcm_state: (state in [VM_STATES.index('POWEROFF')]))
@ -1240,6 +1259,7 @@ def main():
"instance_ids": {"required": False, "aliases": ['ids'], "type": "list"}, "instance_ids": {"required": False, "aliases": ['ids'], "type": "list"},
"template_name": {"required": False, "type": "str"}, "template_name": {"required": False, "type": "str"},
"template_id": {"required": False, "type": "int"}, "template_id": {"required": False, "type": "int"},
"vm_start_on_hold": {"default": False, "type": "bool"},
"state": { "state": {
"default": "present", "default": "present",
"choices": ['present', 'absent', 'rebooted', 'poweredoff', 'running'], "choices": ['present', 'absent', 'rebooted', 'poweredoff', 'running'],
@ -1292,6 +1312,7 @@ def main():
instance_ids = params.get('instance_ids') instance_ids = params.get('instance_ids')
requested_template_name = params.get('template_name') requested_template_name = params.get('template_name')
requested_template_id = params.get('template_id') requested_template_id = params.get('template_id')
put_vm_on_hold = params.get('vm_start_on_hold')
state = params.get('state') state = params.get('state')
permissions = params.get('mode') permissions = params.get('mode')
owner_id = params.get('owner_id') owner_id = params.get('owner_id')
@ -1376,12 +1397,12 @@ def main():
# Deploy an exact count of VMs # Deploy an exact count of VMs
changed, instances_list, tagged_instances_list = create_exact_count_of_vms(module, client, template_id, exact_count, attributes, changed, instances_list, tagged_instances_list = create_exact_count_of_vms(module, client, template_id, exact_count, attributes,
count_attributes, labels, count_labels, disk_size, count_attributes, labels, count_labels, disk_size,
networks, hard, wait, wait_timeout) networks, hard, wait, wait_timeout, put_vm_on_hold)
vms = tagged_instances_list vms = tagged_instances_list
elif template_id is not None and state == 'present': elif template_id is not None and state == 'present':
# Deploy count VMs # Deploy count VMs
changed, instances_list, tagged_instances_list = create_count_of_vms(module, client, template_id, count, changed, instances_list, tagged_instances_list = create_count_of_vms(module, client, template_id, count,
attributes, labels, disk_size, networks, wait, wait_timeout) attributes, labels, disk_size, networks, wait, wait_timeout, put_vm_on_hold)
# instances_list - new instances # instances_list - new instances
# tagged_instances_list - all instances with specified `count_attributes` and `count_labels` # tagged_instances_list - all instances with specified `count_attributes` and `count_labels`
vms = instances_list vms = instances_list