Cleaning up diffs after extras modules merge

This commit is contained in:
James Cammarata 2016-12-08 00:34:16 -05:00 committed by Matt Clay
parent 2cfa25c930
commit c65ba07d2c
126 changed files with 505 additions and 457 deletions

View file

@ -26,7 +26,8 @@ DOCUMENTATION = '''
---
module: cs_affinitygroup
short_description: Manages affinity groups on Apache CloudStack based clouds.
description: Create and remove affinity groups.
description:
- Create and remove affinity groups.
version_added: '2.0'
author: "René Moser (@resmo)"
options:
@ -60,6 +61,11 @@ options:
- Account the affinity group is related to.
required: false
default: null
project:
description:
- Name of the project the affinity group is related to.
required: false
default: null
poll_async:
description:
- Poll async jobs until job has finished.
@ -104,6 +110,21 @@ affinity_type:
returned: success
type: string
sample: host anti-affinity
project:
description: Name of project the affinity group is related to.
returned: success
type: string
sample: Production
domain:
description: Domain the affinity group is related to.
returned: success
type: string
sample: example domain
account:
description: Account the affinity group is related to.
returned: success
type: string
sample: example account
'''
# import cloudstack common
@ -223,7 +244,7 @@ def main():
result = acs_ag.get_result(affinity_group)
except CloudStackException, e:
except CloudStackException as e:
module.fail_json(msg='CloudStackException: %s' % str(e))
module.exit_json(**result)