openstack
/
murano
Code Issues Proposed changes

Merge "Correctly release CinderVolumes"

This commit is contained in:
Jenkins 2016-10-04 16:26:27 +00:00 committed by Gerrit Code Review
parent dd1c23de38 63956cf2c2
commit c6255b24df
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
meta/io.murano/Classes/resources/CinderVolume.yaml
View File

@ -94,7 +94,7 @@ Methods:
deploy:
Body:
- $._region: $.getRegion()
- $region: $.getRegion()
- If: $.sourceSnapshot != null
Then:
$.sourceSnapshot.validate()
@ -108,11 +108,11 @@ Methods:
- $snippet: $.buildResourceDefinition()
- If: $.getAttr(lastTemplate) != $snippet
Then:
- $template: $._region.stack.current()
- $template: $region.stack.current()
- $template: $template.mergeWith($snippet, maxLevels => 2)
- $._region.stack.setTemplate($template)
- $._region.stack.push()
- $outputs: $._region.stack.output()
- $region.stack.setTemplate($template)
- $region.stack.push()
- $outputs: $region.stack.output()
- $.openstackId: $outputs.get(format('vol-{0}-id', id($)))
- $.setAttr(lastTemplate, $snippet)
@ -120,11 +120,12 @@ Methods:
Body:
- If: $.getAttr(lastTemplate) != null
Then:
- $template: $._region.stack.current()
- $region: $.getRegion()
- $template: $region.stack.current()
- $template.resources: $template.resources.delete(format('vol-{0}', id($)))
- $template.outputs: $template.outputs.delete(format('vol-{0}-id', id($)))
- $._region.stack.setTemplate($template)
- $._region.stack.push()
- $region.stack.setTemplate($template)
- $region.stack.push()
- $.setAttr(lastTemplate, null)
- $.openstackId: null

4
releasenotes/notes/release-cinder-volumes-01c29d28031a94dd.yaml Normal file
View File

@ -0,0 +1,4 @@
---
fixes:
- Previously Cinder Volumes created in MuranoPL were not released correctly
on object destruction. The issue is now fixed.