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

cs_instance: improve hypervisor argument and return

Browse source
This commit is contained in:
Rene Moser 2015-05-30 00:24:34 +02:00 committed by Matt Clay
parent 30feb9d387
commit 62e062eb34
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/modules/extras/cloud/cloudstack/cs_instance.py
View file

@ -326,6 +326,11 @@ tags:
returned: success returned: success
type: dict type: dict
sample: '[ { "key": "foo", "value": "bar" } ]' sample: '[ { "key": "foo", "value": "bar" } ]'
hypervisor:
description: Hypervisor related to this instance.
returned: success
type: string
sample: KVM
''' '''
import base64 import base64
@ -712,6 +717,8 @@ class AnsibleCloudStackInstance(AnsibleCloudStack):
self.result['account'] = instance['account'] self.result['account'] = instance['account']
if 'project' in instance: if 'project' in instance:
self.result['project'] = instance['project'] self.result['project'] = instance['project']
if 'hypervisor' in instance:
self.result['hypervisor'] = instance['hypervisor']
if 'publicip' in instance: if 'publicip' in instance:
self.result['public_ip'] = instance['public_ip'] self.result['public_ip'] = instance['public_ip']
if 'passwordenabled' in instance: if 'passwordenabled' in instance:
@ -771,7 +778,7 @@ def main():
disk_offering = dict(default=None), disk_offering = dict(default=None),
disk_size = dict(type='int', default=None), disk_size = dict(type='int', default=None),
keyboard = dict(choices=['de', 'de-ch', 'es', 'fi', 'fr', 'fr-be', 'fr-ch', 'is', 'it', 'jp', 'nl-be', 'no', 'pt', 'uk', 'us'], default=None), keyboard = dict(choices=['de', 'de-ch', 'es', 'fi', 'fr', 'fr-be', 'fr-ch', 'is', 'it', 'jp', 'nl-be', 'no', 'pt', 'uk', 'us'], default=None),
hypervisor = dict(default=None), hypervisor = dict(choices=['KVM', 'VMware', 'BareMetal', 'XenServer', 'LXC', 'HyperV', 'UCS', 'OVM'], default=None),
security_groups = dict(type='list', aliases=[ 'security_group' ], default=[]), security_groups = dict(type='list', aliases=[ 'security_group' ], default=[]),
affinity_groups = dict(type='list', aliases=[ 'affinity_group' ], default=[]), affinity_groups = dict(type='list', aliases=[ 'affinity_group' ], default=[]),
domain = dict(default=None), domain = dict(default=None),