Update os_volume for latest shade

The shade volume API was updated to return a dict rather than the
object as returned by cinder.
reviewable/pr18780/r1
David Shrewsbury 10 years ago
parent d7e65eab41
commit f4600edeb8

@ -88,7 +88,7 @@ EXAMPLES = '''
def _present_volume(module, cloud): def _present_volume(module, cloud):
if cloud.volume_exists(module.params['display_name']): if cloud.volume_exists(module.params['display_name']):
v = cloud.get_volume(module.params['display_name']) v = cloud.get_volume(module.params['display_name'])
module.exit_json(changed=False, id=v.id, info=v._info) module.exit_json(changed=False, id=v['id'])
volume_args = dict( volume_args = dict(
size=module.params['size'], size=module.params['size'],
@ -105,11 +105,10 @@ def _present_volume(module, cloud):
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)
module.exit_json(changed=True, id=volume.id, info=volume._info) module.exit_json(changed=True, id=volume['id'])
def _absent_volume(module, cloud): def _absent_volume(module, cloud):
try: try:
cloud.delete_volume( cloud.delete_volume(
name_or_id=module.params['display_name'], name_or_id=module.params['display_name'],

Loading…
Cancel
Save