diff options
| author | René Moser <mail@renemoser.net> | 2018-09-26 09:02:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-26 09:02:06 +0200 |
| commit | c09b785a663f3bc6bd481d67b48e3a95a945f9aa (patch) | |
| tree | 54e6a52473534f1dc71bb22ae43bc043aa86956f | |
| parent | 95cfcac6941bdbae1b8aadd4da766cedfc2c41bd (diff) | |
| download | ansible-c09b785a663f3bc6bd481d67b48e3a95a945f9aa.tar.gz | |
cs_instance: doc: fix typo in examples (#46035)
| -rw-r--r-- | lib/ansible/modules/cloud/cloudstack/cs_instance.py | 8 | ||||
| -rw-r--r-- | test/sanity/validate-modules/ignore.txt | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/ansible/modules/cloud/cloudstack/cs_instance.py b/lib/ansible/modules/cloud/cloudstack/cs_instance.py index 2449a77a82..c6a9a58bb7 100644 --- a/lib/ansible/modules/cloud/cloudstack/cs_instance.py +++ b/lib/ansible/modules/cloud/cloudstack/cs_instance.py @@ -77,11 +77,11 @@ options: - 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. - 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: description: - 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: description: - List of networks to use for the new instance. @@ -189,7 +189,7 @@ EXAMPLES = ''' delegate_to: localhost - name: for changing a running instance, use the 'force' parameter -- cs_instance: + cs_instance: name: web-vm-1 display_name: web-vm-01.example.com iso: Linux Debian 7 64-bit @@ -1004,7 +1004,7 @@ def main(): disk_offering=dict(), 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), host=dict(), security_groups=dict(type='list', aliases=['security_group']), diff --git a/test/sanity/validate-modules/ignore.txt b/test/sanity/validate-modules/ignore.txt index ef550bb4df..4e38db5d2f 100644 --- a/test/sanity/validate-modules/ignore.txt +++ b/test/sanity/validate-modules/ignore.txt @@ -147,7 +147,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_domain.py E325 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_iso.py E323 lib/ansible/modules/cloud/cloudstack/cs_iso.py E325 |