diff options
| author | Robert Osowiecki <robert.osowiecki@gmail.com> | 2019-04-17 17:11:57 +0200 |
|---|---|---|
| committer | Toshio Kuratomi <a.badger@gmail.com> | 2019-04-23 20:28:18 -0600 |
| commit | 9aa9c11a1afc15b0b3eae092a1249b51dd2694b3 (patch) | |
| tree | fef9b182457ff1b60833e6ea0df0e7bbf08129a4 | |
| parent | d9c065d217f30a2afcbe64936ac987375d11985f (diff) | |
| download | ansible-9aa9c11a1afc15b0b3eae092a1249b51dd2694b3.tar.gz | |
vsphere_guest: corrected fix #19716 misbehaviour (#55285)
* creating machines without vm_extra_config is possible
* power state operation on absent machines will fail
(cherry picked from commit 93758a5141f5d9f441ff77e7ba2d1fdf7fda25d6)
| -rw-r--r-- | changelogs/fragments/vsphere_guest-corrected-state-operations.yml | 4 | ||||
| -rw-r--r-- | lib/ansible/modules/cloud/vmware/_vsphere_guest.py | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/changelogs/fragments/vsphere_guest-corrected-state-operations.yml b/changelogs/fragments/vsphere_guest-corrected-state-operations.yml new file mode 100644 index 0000000000..ad34cae8b6 --- /dev/null +++ b/changelogs/fragments/vsphere_guest-corrected-state-operations.yml @@ -0,0 +1,4 @@ +--- +bugfixes: + - vsphere_guest - creating machines without vm_extra_config allowed + - vsphere_guest - powering on/off absent virtual machine will fail diff --git a/lib/ansible/modules/cloud/vmware/_vsphere_guest.py b/lib/ansible/modules/cloud/vmware/_vsphere_guest.py index d9c972d916..a7743961aa 100644 --- a/lib/ansible/modules/cloud/vmware/_vsphere_guest.py +++ b/lib/ansible/modules/cloud/vmware/_vsphere_guest.py @@ -1904,9 +1904,8 @@ def main(): module.exit_json(changed=False, msg="vm %s not present" % guest) # check if user is trying to perform state operation on a vm which doesn't exists - elif state in ['present', 'powered_off', 'powered_on'] and not all((vm_extra_config, - vm_hardware, vm_disk, vm_nic, esxi)): - module.exit_json(changed=False, msg="vm %s not present" % guest) + elif state in ['present', 'powered_off', 'powered_on'] and not all((vm_hardware, vm_disk, vm_nic, esxi)): + module.fail_json(msg="vm %s not present and not all options neccessary to create are provided" % guest) # Create the VM elif state in ['present', 'powered_off', 'powered_on']: |