ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-26 20:31:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge pull request #49678 from resmo/fix/cloudstack-tests-unstable

Browse source 
cloudstack: Fixes for unstable tests
This commit is contained in:
René Moser 2018-12-10 17:39:17 +01:00 • committed by Matt Clay
parent 70ba960f6d
commit e0ad0eb42c
6 changed files with 142 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/modules/cloud/cloudstack/cs_instance.py
View file

@ -750,7 +750,6 @@ class AnsibleCloudStackInstance(AnsibleCloudStack):
security_groups_changed = self.security_groups_has_changed()
# Volume data
args_volume_update = {}
root_disk_size = self.module.params.get('root_disk_size')
root_disk_size_changed = False
@ -824,13 +823,14 @@ class AnsibleCloudStackInstance(AnsibleCloudStack):
if instance_state == 'running' and start_vm:
instance = self.start_instance()
else:
self.module.warn("Changes won't be applied to running instances. " +
self.module.warn("Changes won't be applied to running instances. "
"Use force=true to allow the instance %s to be stopped/started." % instance['name'])
# migrate to other host
host_changed = all([
instance['state'].lower() == 'running',
self.module.params.get('host'),
instance['state'].lower() in ['starting', 'running'],
instance.get('hostname') is not None,
self.module.params.get('host') is not None,
self.module.params.get('host') != instance.get('hostname')
])
if host_changed: