Merge pull request #19320 from manics/ansible-modules-core/pull/5176

Allow creation of Openstack volumes from an existing volume
This commit is contained in:
David Shrewsbury 2017-01-27 10:12:00 -05:00 committed by GitHub
commit c950767898

View file

@ -67,6 +67,12 @@ options:
- Volume snapshot id to create from - Volume snapshot id to create from
required: false required: false
default: None default: None
volume:
description:
- Volume name or id to create from
required: false
default: None
version_added: "2.3"
state: state:
description: description:
- Should the resource be present or absent. - Should the resource be present or absent.
@ -109,6 +115,12 @@ 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']:
volume_id = cloud.get_volume_id(module.params['volume'])
if not volume_id:
module.fail_json(msg="Failed to find volume '%s'" % module.params['volume'])
volume_args['source_volid'] = volume_id
volume = cloud.create_volume( volume = cloud.create_volume(
wait=module.params['wait'], timeout=module.params['timeout'], wait=module.params['wait'], timeout=module.params['timeout'],
**volume_args) **volume_args)
@ -134,11 +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=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'], ['image', 'snapshot_id', 'volume'],
], ],
) )
module = AnsibleModule(argument_spec=argument_spec, **module_kwargs) module = AnsibleModule(argument_spec=argument_spec, **module_kwargs)