From: Zane Bitter <zbitter@redhat.com>
Date: Mon, 12 Aug 2013 14:55:36 +0000 (+0200)
Subject: Use correct actions for StackResource
X-Git-Tag: 2014.1~216^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=f117580efce5f82ad7ecadbdb553ef186beae0d9;p=openstack-build%2Fheat-build.git

Use correct actions for StackResource

To perform actions on a stack, we should use the action constants defined
in the Stack, not in another object (and especially not in a Resource).

Change-Id: I3044f6286fc2690c121a3446f42a6896b3ed3271
---

diff --git a/heat/engine/stack_resource.py b/heat/engine/stack_resource.py
index 5c436361..de03960b 100644
--- a/heat/engine/stack_resource.py
+++ b/heat/engine/stack_resource.py
@@ -80,7 +80,7 @@ class StackResource(resource.Resource):
         self.resource_id_set(nested_id)
 
         stack_creator = scheduler.TaskRunner(self._nested.stack_task,
-                                             action=self.CREATE)
+                                             action=self._nested.CREATE)
         stack_creator.start(timeout=self._nested.timeout_secs())
         return stack_creator
 
@@ -133,7 +133,7 @@ class StackResource(resource.Resource):
                                   % self.name)
 
         suspend_task = scheduler.TaskRunner(self._nested.stack_task,
-                                            action=self.SUSPEND,
+                                            action=self._nested.SUSPEND,
                                             reverse=True)
 
         suspend_task.start(timeout=self._nested.timeout_secs())
@@ -155,7 +155,7 @@ class StackResource(resource.Resource):
                                   % self.name)
 
         resume_task = scheduler.TaskRunner(self._nested.stack_task,
-                                           action=self.RESUME,
+                                           action=self._nested.RESUME,
                                            reverse=False)
 
         resume_task.start(timeout=self._nested.timeout_secs())