From 63956cf2c2bba74a9f3335525ebb57c8263f9158 Mon Sep 17 00:00:00 2001
From: Stan Lagun <slagun@mirantis.com>
Date: Mon, 3 Oct 2016 02:11:06 -0700
Subject: [PATCH] Correctly release CinderVolumes

Added missing call to .getRegion() in CinderVolume's
releaseResource method.

Change-Id: I68d436c1a9bc4ce856de29881fd2d7ed10c4c089
Closes-Bug: #1629795
---
 .../Classes/resources/CinderVolume.yaml         | 17 +++++++++--------
 ...release-cinder-volumes-01c29d28031a94dd.yaml |  4 ++++
 2 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100644 releasenotes/notes/release-cinder-volumes-01c29d28031a94dd.yaml

diff --git a/meta/io.murano/Classes/resources/CinderVolume.yaml b/meta/io.murano/Classes/resources/CinderVolume.yaml
index 55651db2a..919081f55 100644
--- a/meta/io.murano/Classes/resources/CinderVolume.yaml
+++ b/meta/io.murano/Classes/resources/CinderVolume.yaml
@@ -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
 
diff --git a/releasenotes/notes/release-cinder-volumes-01c29d28031a94dd.yaml b/releasenotes/notes/release-cinder-volumes-01c29d28031a94dd.yaml
new file mode 100644
index 000000000..bfbf82bb3
--- /dev/null
+++ b/releasenotes/notes/release-cinder-volumes-01c29d28031a94dd.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+  - Previously Cinder Volumes created in MuranoPL were not released correctly
+    on object destruction. The issue is now fixed.