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

[2.7] backport cs_instance fixes (#46274)

Browse source 
* cs_instance: doc: fix typo in examples (#46035)


(cherry picked from commit c09b785a66)

* cs_instance: fix host migration without volume (#46115)


(cherry picked from commit e7926cf9f4)

* add changelog fragment
This commit is contained in:
René Moser 2018-10-10 03:22:07 +02:00 committed by Toshio Kuratomi
parent c481a5bf4a
commit 083d2a6ad7
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelogs/fragments/46115-46035-cs_instance-fixes.yml Normal file
View file

@ -0,0 +1,3 @@
bugfixes:
- cs_instance - Fix host migration without volume (https://github.com/ansible/ansible/pull/46115).
- cs_instance - Fix docs and typo in examples (https://github.com/ansible/ansible/pull/46035).

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

@ -77,11 +77,11 @@ options:
- Name the hypervisor to be used for creating the new instance. - Name the hypervisor to be used for creating the new instance.
- Relevant when using I(state=present), but only considered if not set on ISO/template. - Relevant when using I(state=present), but only considered if not set on ISO/template.
- If not set or found on ISO/template, first found hypervisor will be used. - If not set or found on ISO/template, first found hypervisor will be used.
choices: [ KVM, VMware, BareMetal, XenServer, LXC, HyperV, UCS, OVM, Simulator ] choices: [ KVM, kvm, VMware, vmware, BareMetal, baremetal, XenServer, xenserver, LXC, lxc, HyperV, hyperv, UCS, ucs, OVM, ovm, Simulator, simulator ]
keyboard: keyboard:
description: description:
- Keyboard device type for the instance. - Keyboard device type for the instance.
choices: [ de, de-ch, es, fi, fr, fr-be, fr-ch, is, it, jp, nl-be, no, pt, uk, us ] choices: [ 'de', 'de-ch', 'es', 'fi', 'fr', 'fr-be', 'fr-ch', 'is', 'it', 'jp', 'nl-be', 'no', 'pt', 'uk', 'us' ]
networks: networks:
description: description:
- List of networks to use for the new instance. - List of networks to use for the new instance.
@ -189,7 +189,7 @@ EXAMPLES = '''
delegate_to: localhost delegate_to: localhost
- name: for changing a running instance, use the 'force' parameter - name: for changing a running instance, use the 'force' parameter
- cs_instance: cs_instance:
name: web-vm-1 name: web-vm-1
display_name: web-vm-01.example.com display_name: web-vm-01.example.com
iso: Linux Debian 7 64-bit iso: Linux Debian 7 64-bit
@ -840,7 +840,7 @@ class AnsibleCloudStackInstance(AnsibleCloudStack):
'hostid': self.get_host_id(), 'hostid': self.get_host_id(),
} }
if not self.module.check_mode: if not self.module.check_mode:
res = self.query_api('migrateVirtualMachineWithVolume', **args_host) res = self.query_api('migrateVirtualMachine', **args_host)
instance = self.poll_job(res, 'virtualmachine') instance = self.poll_job(res, 'virtualmachine')
return instance return instance
@ -1004,7 +1004,7 @@ def main():
disk_offering=dict(), disk_offering=dict(),
disk_size=dict(type='int'), disk_size=dict(type='int'),
root_disk_size=dict(type='int'), root_disk_size=dict(type='int'),
keyboard=dict(choices=['de', 'de-ch', 'es', 'fi', 'fr', 'fr-be', 'fr-ch', 'is', 'it', 'jp', 'nl-be', 'no', 'pt', 'uk', 'us']), keyboard=dict(type='str', choices=['de', 'de-ch', 'es', 'fi', 'fr', 'fr-be', 'fr-ch', 'is', 'it', 'jp', 'nl-be', 'no', 'pt', 'uk', 'us']),
hypervisor=dict(choices=CS_HYPERVISORS), hypervisor=dict(choices=CS_HYPERVISORS),
host=dict(), host=dict(),
security_groups=dict(type='list', aliases=['security_group']), security_groups=dict(type='list', aliases=['security_group']),

1
test/sanity/validate-modules/ignore.txt
View file

@ -149,7 +149,6 @@ lib/ansible/modules/cloud/cloudscale/cloudscale_server.py E325
lib/ansible/modules/cloud/cloudstack/cs_cluster.py E326 lib/ansible/modules/cloud/cloudstack/cs_cluster.py E326
lib/ansible/modules/cloud/cloudstack/cs_domain.py E325 lib/ansible/modules/cloud/cloudstack/cs_domain.py E325
lib/ansible/modules/cloud/cloudstack/cs_host.py E326 lib/ansible/modules/cloud/cloudstack/cs_host.py E326
lib/ansible/modules/cloud/cloudstack/cs_instance.py E326
lib/ansible/modules/cloud/cloudstack/cs_instance_nic_secondaryip.py E325 lib/ansible/modules/cloud/cloudstack/cs_instance_nic_secondaryip.py E325
lib/ansible/modules/cloud/cloudstack/cs_iso.py E323 lib/ansible/modules/cloud/cloudstack/cs_iso.py E323
lib/ansible/modules/cloud/cloudstack/cs_iso.py E325 lib/ansible/modules/cloud/cloudstack/cs_iso.py E325