ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-24 13:50:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Use volume as input parameter name to match image.

Browse source
This commit is contained in:
Simon Li 2016-10-07 15:11:08 +01:00 • committed by ansible
commit de714e5af8
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/ansible/modules/cloud/openstack/os_volume.py
View file

@ -67,9 +67,9 @@ options:
- Volume snapshot id to create from - Volume snapshot id to create from
required: false required: false
default: None default: None
volume_src: volume:
description: description:
- Volume source to create from - Volume name or id to create from
required: false required: false
default: None default: None
version_added: "2.3" version_added: "2.3"
@ -115,10 +115,10 @@ def _present_volume(module, cloud):
image_id = cloud.get_image_id(module.params['image']) image_id = cloud.get_image_id(module.params['image'])
volume_args['imageRef'] = image_id volume_args['imageRef'] = image_id
if module.params['volume_src']: if module.params['volume']:
volume_id = cloud.get_volume_id(module.params['volume_src']) volume_id = cloud.get_volume_id(module.params['volume'])
if not volume_id: if not volume_id:
module.fail_json(msg="Failed to find volume source '%s'" % module.params['volume_src']) module.fail_json(msg="Failed to find volume '%s'" % module.params['volume'])
volume_args['source_volid'] = volume_id volume_args['source_volid'] = volume_id
volume = cloud.create_volume( volume = cloud.create_volume(
@ -146,12 +146,12 @@ def main():
display_description=dict(default=None, aliases=['description']), display_description=dict(default=None, aliases=['description']),
image=dict(default=None), image=dict(default=None),
snapshot_id=dict(default=None), snapshot_id=dict(default=None),
volume_src=dict(default=None), volume=dict(default=None),
state=dict(default='present', choices=['absent', 'present']), state=dict(default='present', choices=['absent', 'present']),
) )
module_kwargs = openstack_module_kwargs( module_kwargs = openstack_module_kwargs(
mutually_exclusive=[ mutually_exclusive=[
['image', 'snapshot_id', 'volume_src'], ['image', 'snapshot_id', 'volume'],
], ],
) )
module = AnsibleModule(argument_spec=argument_spec, **module_kwargs) module = AnsibleModule(argument_spec=argument_spec, **module_kwargs)