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

vmware_guest: Fix customvalues when VM doesn't exists (#20094)

Browse source
This commit is contained in:
Ner'zhul 2017-01-10 17:07:42 +01:00 committed by jctanner
parent 3ceff2f9b3
commit 16a1585ffc
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/modules/cloud/vmware/vmware_guest.py
View file

@ -758,7 +758,6 @@ class PyVmomiHelper(object):
return result return result
def gather_facts(self, vm): def gather_facts(self, vm):
""" Gather facts from vim.VirtualMachine object. """ """ Gather facts from vim.VirtualMachine object. """
facts = { facts = {
'module_hw': True, 'module_hw': True,
@ -978,7 +977,7 @@ class PyVmomiHelper(object):
self.module.exit_json(msg="customvalues items required both 'key' and 'value fields.") self.module.exit_json(msg="customvalues items required both 'key' and 'value fields.")
# If kv is not kv fetched from facts, change it # If kv is not kv fetched from facts, change it
if kv['key'] in facts['customvalues'] and facts['customvalues'][kv['key']] != kv['value']: if kv['key'] not in facts['customvalues'] or facts['customvalues'][kv['key']] != kv['value']:
try: try:
vm_obj.setCustomValue(key=kv['key'], value=kv['value']) vm_obj.setCustomValue(key=kv['key'], value=kv['value'])
self.change_detected = True self.change_detected = True
@ -1340,7 +1339,6 @@ class PyVmomiHelper(object):
self.configure_cpu_and_memory(vm_obj=vm_obj, vm_creation=True) self.configure_cpu_and_memory(vm_obj=vm_obj, vm_creation=True)
self.configure_disks(vm_obj=vm_obj) self.configure_disks(vm_obj=vm_obj)
self.configure_network(vm_obj=vm_obj) self.configure_network(vm_obj=vm_obj)
self.customize_customvalues(vm_obj=vm_obj)
if len(self.params['customization']) > 0: if len(self.params['customization']) > 0:
self.customize_vm(vm_obj=vm_obj) self.customize_vm(vm_obj=vm_obj)
@ -1385,6 +1383,8 @@ class PyVmomiHelper(object):
task = vm.ReconfigVM_Task(annotation_spec) task = vm.ReconfigVM_Task(annotation_spec)
self.wait_for_task(task) self.wait_for_task(task)
self.customize_customvalues(vm_obj=vm)
if self.params['wait_for_ip_address'] or self.params['state'] in ['poweredon', 'restarted']: if self.params['wait_for_ip_address'] or self.params['state'] in ['poweredon', 'restarted']:
self.set_powerstate(vm, 'poweredon', force=False) self.set_powerstate(vm, 'poweredon', force=False)